2002-02-25 06:31:19 +08:00
|
|
|
|
/* Target-struct-independent code to start (run) and stop an inferior
|
|
|
|
|
process.
|
2002-01-18 06:15:18 +08:00
|
|
|
|
|
2007-01-10 01:59:20 +08:00
|
|
|
|
Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
|
2008-01-02 06:53:26 +08:00
|
|
|
|
1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
|
2009-01-03 13:58:08 +08:00
|
|
|
|
2008, 2009 Free Software Foundation, Inc.
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
1999-07-08 04:19:36 +08:00
|
|
|
|
This file is part of GDB.
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
1999-07-08 04:19:36 +08:00
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
|
it under the terms of the GNU General Public License as published by
|
2007-08-24 02:08:50 +08:00
|
|
|
|
the Free Software Foundation; either version 3 of the License, or
|
1999-07-08 04:19:36 +08:00
|
|
|
|
(at your option) any later version.
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
1999-07-08 04:19:36 +08:00
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
GNU General Public License for more details.
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
1999-07-08 04:19:36 +08:00
|
|
|
|
You should have received a copy of the GNU General Public License
|
2007-08-24 02:08:50 +08:00
|
|
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
#include "defs.h"
|
|
|
|
|
#include "gdb_string.h"
|
|
|
|
|
#include <ctype.h>
|
|
|
|
|
#include "symtab.h"
|
|
|
|
|
#include "frame.h"
|
|
|
|
|
#include "inferior.h"
|
2005-01-12 Andrew Cagney <cagney@gnu.org>
* exceptions.h (enum return_reason, RETURN_MASK)
(RETURN_MASK_QUIT, RETURN_MASK_ERROR, RETURN_MASK_ALL)
(return_mask, throw_exception, catch_exceptions_ftype)
(catch_exceptions_with_msg, catch_errors_ftype, catch_errors)
(catch_command_errors_ftype, catch_command_errors): Move to
exceptions.h.
* exceptions.c, exceptions.h: New files.
* top.c: Do not include <setjmp.h>.
(SIGJMP_BUF, SIGSETJMP, SIGLONGJMP, catch_return)
(throw_exception, catcher, catch_exceptions)
(catch_exceptions_with_msg, struct catch_errors_args)
(do_catch_errors, catch_errors, struct captured_command_args)
(do_captured_command, catch_command_errors): Move to exceptions.c.
* wrapper.c, wince.c, win32-nat.c, utils.c: Include "exceptions.h".
* tui/tui-interp.c, top.c, thread.c, symmisc.c: Ditto.
* symfile-mem.c, stack.c, solib.c, rs6000-nat.c: Ditto.
* remote-sds.c, remote-mips.c, remote-fileio.c: Ditto.
* remote-e7000.c, objc-lang.c, ocd.c: Ditto.
* remote.c, nto-procfs.c, monitor.c, mi/mi-main.c: Ditto.
* main.c, m32r-rom.c, infrun.c, inf-loop.c: Ditto.
* hppa-hpux-tdep.c, frame.c, event-top.c, event-loop.c: Ditto.
* corelow.c, corefile.c, cli/cli-interp.c, breakpoint.c: Ditto.
* ada-valprint.c, ada-lang.c: Ditto.
* Makefile.in (HFILES_NO_SRCDIR, COMMON_OBS): Add exceptions.h and
exceptions.o. Update all dependencies.
2005-01-13 02:31:35 +08:00
|
|
|
|
#include "exceptions.h"
|
1999-04-16 09:35:26 +08:00
|
|
|
|
#include "breakpoint.h"
|
2000-02-09 16:52:47 +08:00
|
|
|
|
#include "gdb_wait.h"
|
1999-04-16 09:35:26 +08:00
|
|
|
|
#include "gdbcore.h"
|
|
|
|
|
#include "gdbcmd.h"
|
2001-07-16 Elena Zannoni <ezannoni@redhat.com>
* top.c (is_complete_command, init_cmd_lists, init_cli_cmds,
execute_user_command, do_setshow_command, get_prompt, init_proc,
serial_log_command): Remove extern declarations. Include
cli/cli-cmds.h, cli/cli-script.h, cli/cli-setshow.h, serial.h.
* gdbcmd.h (execute_user_command): Remove declaration, it's already
in cli/cli-script.h.
* command.h (do_setshow_command): Remove declaration, it's already
in cli/cli-setshow.h.
* infrun.c: Include "cli/cli-script.h" for execute_user_command.
* Makefile.in (infrun.o): Update dependencies.
(top.o): Ditto.
* cli/cli-setshow.h: Add comment for do_setshow_command.
2001-07-16 22:46:34 +08:00
|
|
|
|
#include "cli/cli-script.h"
|
1999-04-16 09:35:26 +08:00
|
|
|
|
#include "target.h"
|
|
|
|
|
#include "gdbthread.h"
|
|
|
|
|
#include "annotate.h"
|
2001-01-27 08:43:26 +08:00
|
|
|
|
#include "symfile.h"
|
1999-04-27 02:34:20 +08:00
|
|
|
|
#include "top.h"
|
1999-04-16 09:35:26 +08:00
|
|
|
|
#include <signal.h>
|
1999-10-06 07:13:56 +08:00
|
|
|
|
#include "inf-loop.h"
|
2001-03-01 09:39:22 +08:00
|
|
|
|
#include "regcache.h"
|
2001-10-22 01:19:38 +08:00
|
|
|
|
#include "value.h"
|
2003-03-19 03:06:54 +08:00
|
|
|
|
#include "observer.h"
|
2003-03-26 11:39:44 +08:00
|
|
|
|
#include "language.h"
|
* solib.h (CLEAR_SOLIB, SOLIB_ADD)
(SOLIB_CREATE_INFERIOR_HOOK, SOLIB_REMOVE_INFERIOR_HOOK)
(SOLIB_IN_DYNAMIC_LINKER, SOLIB_RESTART)
(DISABLE_UNSETTABLE_BREAK, PC_SOLIB)
(IN_SOLIB_DYNSYM_RESOLVE_CODE): Remove defines and orphaned
comments.
* breakpoint.c: Include "solib.h".
(insert_bp_location) [!DISABLE_UNSETTABLE_BREAK]: Call
solib_address.
(remove_solib_event_breakpoints, create_solib_event_breakpoint)
(disable_breakpoints_in_shlibs)
(disable_breakpoints_in_unloaded_shlib)
(re_enable_breakpoints_in_shlibs): Compile if SOLIB_ADD isn't
defined. If PC_SOLIB isn't defined, call solib_address.
(_initialize_breakpoint): Unconditionally install observer.
* corelow.c: Include "solib.h".
[SOLIB_ADD] (solib_add_stub): Remove prototype.
(core_close) [!CLEAR_SOLIB]: Call clear_solib.
(solib_add_stub) [!SOLIB_ADD] Call solib_add.
(core_open): Unconditionally call solib_add_stub.
* fork-child.c: Include "solib.h".
(fork_inferior) [!SOLIB_CREATE_INFERIOR_HOOK]: Call
solib_create_inferior_hook.
* infcmd.c: Include "solib.h".
(attach_command) [!SOLIB_ADD]: Call shlib_rescan. Unconditionally
call re_enable_breakpoints_in_shlibs.
* infrun.c: Include "solib.h".
(SOLIB_IN_SYNSYM_RESOLVE_CODE): Don't define if not already
defined.
(stop_on_solib_events, show_stop_on_solib_events): Include
unconditionally.
(follow_exec) [!SOLIB_CREATE_INFERIOR_HOOK]: Call
solib_create_inferior_hook.
(handle_inferior_event) [!SOLIB_ADD]: Call shlib_add.
[!IN_SOLIB_DYNSYM_RESOLVE_CODE]: Call in_solib_dynsym_resolve_code.
(_initialize_infrun): Unconditionally add "stop_on_solib-events"
command.
* remote.c: Include "solib.h".
(remote_open_1): Unconditionally call no_shared_libraries.
[!SOLIB_CREATE_INFERIOR_HOOK] Call solib_create_inferior_hook.
* stack.c: Include "solib.h".
(print_frame) [!PC_SOLIB] Call shlib_for_pc.
* xcoffsolib.c (no_shared_libraries): Remove function.
* Makefile.in (SFILES): Add solib.c.
(ALLDEPFILES): Remove solib.c.
(COMMON_OBS): Add solib.o.
(breakpoint.o, corelow.o, fork-chiled.o, infcmd.o, infrun.o)
(remote.o, stack.o): Update dependencies.
2005-05-13 04:21:18 +08:00
|
|
|
|
#include "solib.h"
|
2005-11-07 23:27:07 +08:00
|
|
|
|
#include "main.h"
|
2004-02-17 04:49:51 +08:00
|
|
|
|
#include "gdb_assert.h"
|
2005-05-29 11:13:19 +08:00
|
|
|
|
#include "mi/mi-common.h"
|
Exited threads.
* thread.c (enum thread_state): New.
(thread_state main_thread_running): Delete, in favor of...
(thread_state main_thread_state): ... this. Update throughout.
(clear_thread_inferior_resources): New, split from free_thread.
(free_thread): Call clear_thread_inferior_resources.
(init_thread_list): Set main thread to stopped state.
(add_thread_silent): Take care of PTID reuses.
(delete_thread): If deleting inferior_ptid or a thread with
refcount > 0, mark it as exited, but still keep it in the list.
Only notify of thread exits, if we haven't done so yet.
(iterate_over_threads): Make it safe to delete threads while
iterating over them.
(do_captured_list_thread_ids): Don't account for exited threads.
(thread_alive): Check for the THREAD_EXITED state, and don't set
ptid to -1 on exited threads.
(set_running): Update to account for extra possible states.
(is_thread_state): New.
(is_stopped, is_exited): New.
(is_running): Implement in terms of is_thread_state.
(any_running): Update.
(print_thread_info): Update. Account for exited threads. Don't
warn about missed frame restoring here, its done in the cleanup.
(switch_to_thread): Don't read from a thread that has gone.
(restore_current_thread): In non-stop mode, do a full context
switch.
(restore_selected_frame): Add a frame_level argument. Rewrite.
(struct current_thread_cleanup): Add selected_frame_level and
was_stopped members.
(do_restore_current_thread_cleanup): Check if thread was stopped
and still is, and if the target has registers, stack and memory
before restoring the selected frame. Don't delete the cleanup
argument here.
(restore_current_thread_cleanup_dtor): New.
(make_cleanup_restore_current_thread): Remove all arguments.
Rewrite.
(thread_apply_all_command): Update. Prune threads.
(thread_apply_command): Update.
(thread_command): Account for currently selected exited thread.
(do_captured_thread_select): Check for a running thread. Prune
threads.
(_initialize_thread): Make "info threads", "thread", "thread
apply", and "thread apply all" appliable without a selected thread.
* gdbthread.h (struct thread_info): Replace running_ by state_.
Add refcount.
(is_exited, is_stopped): Declare.
(make_cleanup_restore_current_thread): Remove all arguments.
* infrun.c: Include "event-top.h".
(fetch_inferior_event): In non-stop mode, restore selected thread
and frame after handling the event and running breakpoint
commands. Display GDB prompt if needed.
(normal_stop): In non-stop mode, don't print thread switching
notice.
* cli/cli-decode.c (set_cmd_no_selected_thread_ok)
(get_cmd_no_selected_thread_ok): New.
* cli/cli-decode.h (CMD_NO_SELECTED_THREAD_OK): New.
(set_cmd_no_selected_thread_ok, get_cmd_no_selected_thread_ok):
Declare.
* cli/cli-cmds.c: Set "pwd", "help", "info", "show" as
no-selected-thread ok.
* top.c (execute_command): Check for non no-selected-thread-ok
commands.
* linux-nat.c (struct saved_ptids, threads_to_delete)
(record_dead_thread, prune_lwps): Delete.
(exit_lwp): Unconditionally delete thread.
(linux_nat_resume): Remove prune_lwps call.
* infcmd.c (proceed_thread_callback): Check if !is_stopped instead
of is_running. Adjust to make_cleanup_restore_current_thread
interface change.
* mi/mi-main.c (mi_cmd_execute): Only allow a few commands if the
selected thread has exited.
* inf-loop.c (inferior_event_handler): Don't display the prompt
here.
* varobj.c (c_value_of_root): Update.
* defs.h (make_cleanup_dtor): Declare.
* utils.c (make_cleanup_dtor): New.
* Makefile.in (infrun.o): Depend on $(event_top_h).
2008-07-11 19:07:39 +08:00
|
|
|
|
#include "event-top.h"
|
2009-04-30 11:09:59 +08:00
|
|
|
|
#include "record.h"
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
/* Prototypes for local functions */
|
|
|
|
|
|
1999-08-10 05:36:23 +08:00
|
|
|
|
static void signals_info (char *, int);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
1999-08-10 05:36:23 +08:00
|
|
|
|
static void handle_command (char *, int);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
1999-08-10 05:36:23 +08:00
|
|
|
|
static void sig_print_info (enum target_signal);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
1999-08-10 05:36:23 +08:00
|
|
|
|
static void sig_print_header (void);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2000-05-22 17:02:23 +08:00
|
|
|
|
static void resume_cleanups (void *);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
1999-08-10 05:36:23 +08:00
|
|
|
|
static int hook_stop_stub (void *);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
1999-08-10 05:36:23 +08:00
|
|
|
|
static int restore_selected_frame (void *);
|
|
|
|
|
|
|
|
|
|
static void build_infrun (void);
|
|
|
|
|
|
2003-01-10 02:03:38 +08:00
|
|
|
|
static int follow_fork (void);
|
1999-08-10 05:36:23 +08:00
|
|
|
|
|
|
|
|
|
static void set_schedlock_func (char *args, int from_tty,
|
2002-07-19 01:53:50 +08:00
|
|
|
|
struct cmd_list_element *c);
|
1999-08-10 05:36:23 +08:00
|
|
|
|
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
static int currently_stepping (struct thread_info *tp);
|
1999-08-10 05:36:23 +08:00
|
|
|
|
|
2009-05-29 01:19:58 +08:00
|
|
|
|
static int currently_stepping_or_nexting_callback (struct thread_info *tp,
|
|
|
|
|
void *data);
|
2008-11-18 02:50:22 +08:00
|
|
|
|
|
1999-08-10 05:36:23 +08:00
|
|
|
|
static void xdb_handle_command (char *args, int from_tty);
|
|
|
|
|
|
2007-09-11 02:49:26 +08:00
|
|
|
|
static int prepare_to_proceed (int);
|
2003-06-19 23:04:58 +08:00
|
|
|
|
|
1999-08-10 05:36:23 +08:00
|
|
|
|
void _initialize_infrun (void);
|
1999-07-06 01:58:44 +08:00
|
|
|
|
|
2009-05-25 02:00:08 +08:00
|
|
|
|
void nullify_last_target_wait_ptid (void);
|
|
|
|
|
|
2000-11-11 03:27:45 +08:00
|
|
|
|
/* When set, stop the 'step' command if we enter a function which has
|
|
|
|
|
no line number information. The normal behavior is that we step
|
|
|
|
|
over such function. */
|
|
|
|
|
int step_stop_if_no_debug = 0;
|
2005-02-24 Andrew Cagney <cagney@gnu.org>
Add show_VARIABLE functions, update add_setshow call.
* varobj.c (_initialize_varobj, show_varobjdebug): Add and update.
* valprint.c (_initialize_valprint, show_print_max)
(show_stop_print_at_null, show_repeat_count_threshold)
(show_prettyprint_structs, show_unionprint)
(show_prettyprint_arrays, show_addressprint, show_input_radix)
(show_output_radix): Ditto.
* valops.c (_initialize_valops, show_overload_resolution): Ditto.
* utils.c (initialize_utils, show_chars_per_line)
(show_lines_per_page, show_demangle, show_pagination_enabled)
(show_sevenbit_strings, show_asm_demangle): Ditto
* tui/tui-win.c (_initialize_tui_win, show_tui_border_kind)
(show_tui_border_mode, show_tui_active_border_mode): Ditto.
* top.c (init_main, show_new_async_prompt)
(show_async_command_editing_p, show_write_history_p)
(show_history_size, show_history_filename, show_caution)
(show_annotation_level, init_main): Ditto.
* target.c (initialize_targets, show_targetdebug)
(show_trust_readonly): Ditto.
* symfile.c (_initialize_symfile, show_symbol_reloading)
(show_ext_args, show_download_write_size)
(show_debug_file_directory): Ditto.
* source.c (_initialize_source, show_lines_to_list): Ditto.
* solib.c (_initialize_solib, show_auto_solib_add)
(show_solib_search_path): Ditto.
* p-valprint.c (_initialize_pascal_valprint)
(show_pascal_static_field_print): Ditto.
* printcmd.c (_initialize_printcmd, show_max_symbolic_offset)
(show_print_symbol_filename): Add and update.
* parse.c (_initialize_parse, show_expressiondebug): Dito.
* observer.c (_initialize_observer, show_observer_debug): Dito.
* maint.c (_initialize_maint_cmds, show_watchdog)
(show_maintenance_profile_p): Dito.
* linux-nat.c (_initialize_linux_nat, show_debug_linux_nat): Dito.
* infrun.c (_initialize_infrun, show_debug_infrun)
(show_stop_on_solib_events, show_follow_fork_mode_string)
(show_scheduler_mode, show_step_stop_if_no_debug): Ditto.
* infcall.c (_initialize_infcall, show_coerce_float_to_double_p)
(show_unwind_on_signal_p): Ditto.
* gdbtypes.c (build_gdbtypes, show_opaque_type_resolution)
(_initialize_gdbtypes, show_overload_debug): Ditto.
* gdb-events.c, gdb-events.sh (_initialize_gdb_events)
(show_gdb_events_debug): Ditto.
* gdbarch.c, gdbarch.sh (show_gdbarch_debug)
(_initialize_gdbarch): Ditto.
* frame.c (_initialize_frame, show_backtrace_past_main)
(show_backtrace_past_entry, show_backtrace_limit)
(show_frame_debug): Ditto.
* exec.c (_initialize_exec, show_write_files): Ditto.
* dwarf2read.c (_initialize_dwarf2_read)
(show_dwarf2_max_cache_age): Ditto.
* demangle.c (_initialize_demangler)
(show_demangling_style_names): Ditto.
* dcache.c (_initialize_dcache, show_dcache_enabled_p): Ditto.
* cp-valprint.c (show_static_field_print)
(_initialize_cp_valprint, show_vtblprint, show_objectprint): Ditto.
* corefile.c (_initialize_core, show_gnutarget_string): Ditto.
* cli/cli-logging.c (_initialize_cli_logging)
(show_logging_overwrite, show_logging_redirect)
(show_logging_filename): Ditto.
* cli/cli-cmds.c (show_info_verbose, show_history_expansion_p)
(init_cli_cmds, show_baud_rate, show_remote_debug)
(show_remote_timeout, show_max_user_call_depth): Ditto.
* charset.c (show_host_charset_name, show_target_charset_name)
(initialize_charset): Ditto.
* breakpoint.c (show_can_use_hw_watchpoints)
(show_pending_break_support, _initialize_breakpoint): Ditto.
2005-02-24 21:51:36 +08:00
|
|
|
|
static void
|
|
|
|
|
show_step_stop_if_no_debug (struct ui_file *file, int from_tty,
|
|
|
|
|
struct cmd_list_element *c, const char *value)
|
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (file, _("Mode of the step operation is %s.\n"), value);
|
|
|
|
|
}
|
2000-11-11 03:27:45 +08:00
|
|
|
|
|
1999-07-06 01:58:44 +08:00
|
|
|
|
/* In asynchronous mode, but simulating synchronous execution. */
|
1999-08-10 05:36:23 +08:00
|
|
|
|
|
1999-07-06 01:58:44 +08:00
|
|
|
|
int sync_execution = 0;
|
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
/* wait_for_inferior and normal_stop use this to notify the user
|
|
|
|
|
when the inferior stopped in a different thread than it had been
|
1999-08-10 05:36:23 +08:00
|
|
|
|
running in. */
|
|
|
|
|
|
2001-05-04 12:15:33 +08:00
|
|
|
|
static ptid_t previous_inferior_ptid;
|
1999-04-27 02:34:20 +08:00
|
|
|
|
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
int debug_displaced = 0;
|
|
|
|
|
static void
|
|
|
|
|
show_debug_displaced (struct ui_file *file, int from_tty,
|
|
|
|
|
struct cmd_list_element *c, const char *value)
|
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (file, _("Displace stepping debugging is %s.\n"), value);
|
|
|
|
|
}
|
|
|
|
|
|
2004-11-09 01:25:23 +08:00
|
|
|
|
static int debug_infrun = 0;
|
2005-02-24 Andrew Cagney <cagney@gnu.org>
Add show_VARIABLE functions, update add_setshow call.
* varobj.c (_initialize_varobj, show_varobjdebug): Add and update.
* valprint.c (_initialize_valprint, show_print_max)
(show_stop_print_at_null, show_repeat_count_threshold)
(show_prettyprint_structs, show_unionprint)
(show_prettyprint_arrays, show_addressprint, show_input_radix)
(show_output_radix): Ditto.
* valops.c (_initialize_valops, show_overload_resolution): Ditto.
* utils.c (initialize_utils, show_chars_per_line)
(show_lines_per_page, show_demangle, show_pagination_enabled)
(show_sevenbit_strings, show_asm_demangle): Ditto
* tui/tui-win.c (_initialize_tui_win, show_tui_border_kind)
(show_tui_border_mode, show_tui_active_border_mode): Ditto.
* top.c (init_main, show_new_async_prompt)
(show_async_command_editing_p, show_write_history_p)
(show_history_size, show_history_filename, show_caution)
(show_annotation_level, init_main): Ditto.
* target.c (initialize_targets, show_targetdebug)
(show_trust_readonly): Ditto.
* symfile.c (_initialize_symfile, show_symbol_reloading)
(show_ext_args, show_download_write_size)
(show_debug_file_directory): Ditto.
* source.c (_initialize_source, show_lines_to_list): Ditto.
* solib.c (_initialize_solib, show_auto_solib_add)
(show_solib_search_path): Ditto.
* p-valprint.c (_initialize_pascal_valprint)
(show_pascal_static_field_print): Ditto.
* printcmd.c (_initialize_printcmd, show_max_symbolic_offset)
(show_print_symbol_filename): Add and update.
* parse.c (_initialize_parse, show_expressiondebug): Dito.
* observer.c (_initialize_observer, show_observer_debug): Dito.
* maint.c (_initialize_maint_cmds, show_watchdog)
(show_maintenance_profile_p): Dito.
* linux-nat.c (_initialize_linux_nat, show_debug_linux_nat): Dito.
* infrun.c (_initialize_infrun, show_debug_infrun)
(show_stop_on_solib_events, show_follow_fork_mode_string)
(show_scheduler_mode, show_step_stop_if_no_debug): Ditto.
* infcall.c (_initialize_infcall, show_coerce_float_to_double_p)
(show_unwind_on_signal_p): Ditto.
* gdbtypes.c (build_gdbtypes, show_opaque_type_resolution)
(_initialize_gdbtypes, show_overload_debug): Ditto.
* gdb-events.c, gdb-events.sh (_initialize_gdb_events)
(show_gdb_events_debug): Ditto.
* gdbarch.c, gdbarch.sh (show_gdbarch_debug)
(_initialize_gdbarch): Ditto.
* frame.c (_initialize_frame, show_backtrace_past_main)
(show_backtrace_past_entry, show_backtrace_limit)
(show_frame_debug): Ditto.
* exec.c (_initialize_exec, show_write_files): Ditto.
* dwarf2read.c (_initialize_dwarf2_read)
(show_dwarf2_max_cache_age): Ditto.
* demangle.c (_initialize_demangler)
(show_demangling_style_names): Ditto.
* dcache.c (_initialize_dcache, show_dcache_enabled_p): Ditto.
* cp-valprint.c (show_static_field_print)
(_initialize_cp_valprint, show_vtblprint, show_objectprint): Ditto.
* corefile.c (_initialize_core, show_gnutarget_string): Ditto.
* cli/cli-logging.c (_initialize_cli_logging)
(show_logging_overwrite, show_logging_redirect)
(show_logging_filename): Ditto.
* cli/cli-cmds.c (show_info_verbose, show_history_expansion_p)
(init_cli_cmds, show_baud_rate, show_remote_debug)
(show_remote_timeout, show_max_user_call_depth): Ditto.
* charset.c (show_host_charset_name, show_target_charset_name)
(initialize_charset): Ditto.
* breakpoint.c (show_can_use_hw_watchpoints)
(show_pending_break_support, _initialize_breakpoint): Ditto.
2005-02-24 21:51:36 +08:00
|
|
|
|
static void
|
|
|
|
|
show_debug_infrun (struct ui_file *file, int from_tty,
|
|
|
|
|
struct cmd_list_element *c, const char *value)
|
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (file, _("Inferior debugging is %s.\n"), value);
|
|
|
|
|
}
|
2004-11-09 01:25:23 +08:00
|
|
|
|
|
1999-09-09 08:02:17 +08:00
|
|
|
|
/* If the program uses ELF-style shared libraries, then calls to
|
|
|
|
|
functions in shared libraries go through stubs, which live in a
|
|
|
|
|
table called the PLT (Procedure Linkage Table). The first time the
|
|
|
|
|
function is called, the stub sends control to the dynamic linker,
|
|
|
|
|
which looks up the function's real address, patches the stub so
|
|
|
|
|
that future calls will go directly to the function, and then passes
|
|
|
|
|
control to the function.
|
|
|
|
|
|
|
|
|
|
If we are stepping at the source level, we don't want to see any of
|
|
|
|
|
this --- we just want to skip over the stub and the dynamic linker.
|
|
|
|
|
The simple approach is to single-step until control leaves the
|
|
|
|
|
dynamic linker.
|
|
|
|
|
|
2002-02-25 06:31:19 +08:00
|
|
|
|
However, on some systems (e.g., Red Hat's 5.2 distribution) the
|
|
|
|
|
dynamic linker calls functions in the shared C library, so you
|
|
|
|
|
can't tell from the PC alone whether the dynamic linker is still
|
|
|
|
|
running. In this case, we use a step-resume breakpoint to get us
|
|
|
|
|
past the dynamic linker, as if we were using "next" to step over a
|
|
|
|
|
function call.
|
1999-09-09 08:02:17 +08:00
|
|
|
|
|
2008-07-22 10:10:14 +08:00
|
|
|
|
in_solib_dynsym_resolve_code() says whether we're in the dynamic
|
1999-09-09 08:02:17 +08:00
|
|
|
|
linker code or not. Normally, this means we single-step. However,
|
|
|
|
|
if SKIP_SOLIB_RESOLVER then returns non-zero, then its value is an
|
|
|
|
|
address where we can place a step-resume breakpoint to get past the
|
|
|
|
|
linker's symbol resolution function.
|
|
|
|
|
|
2008-07-22 10:10:14 +08:00
|
|
|
|
in_solib_dynsym_resolve_code() can generally be implemented in a
|
1999-09-09 08:02:17 +08:00
|
|
|
|
pretty portable way, by comparing the PC against the address ranges
|
|
|
|
|
of the dynamic linker's sections.
|
|
|
|
|
|
|
|
|
|
SKIP_SOLIB_RESOLVER is generally going to be system-specific, since
|
|
|
|
|
it depends on internal details of the dynamic linker. It's usually
|
|
|
|
|
not too hard to figure out where to put a breakpoint, but it
|
|
|
|
|
certainly isn't portable. SKIP_SOLIB_RESOLVER should do plenty of
|
|
|
|
|
sanity checking. If it can't figure things out, returning zero and
|
|
|
|
|
getting the (possibly confusing) stepping behavior is better than
|
|
|
|
|
signalling an error, which will obscure the change in the
|
|
|
|
|
inferior's state. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
/* This function returns TRUE if pc is the address of an instruction
|
|
|
|
|
that lies within the dynamic linker (such as the event hook, or the
|
|
|
|
|
dld itself).
|
|
|
|
|
|
|
|
|
|
This function must be used only when a dynamic linker event has
|
|
|
|
|
been caught, and the inferior is being stepped out of the hook, or
|
|
|
|
|
undefined results are guaranteed. */
|
|
|
|
|
|
|
|
|
|
#ifndef SOLIB_IN_DYNAMIC_LINKER
|
|
|
|
|
#define SOLIB_IN_DYNAMIC_LINKER(pid,pc) 0
|
|
|
|
|
#endif
|
|
|
|
|
|
1999-09-22 11:28:34 +08:00
|
|
|
|
|
1999-04-27 02:34:20 +08:00
|
|
|
|
/* Convert the #defines into values. This is temporary until wfi control
|
|
|
|
|
flow is completely sorted out. */
|
|
|
|
|
|
2000-03-29 06:30:19 +08:00
|
|
|
|
#ifndef CANNOT_STEP_HW_WATCHPOINTS
|
|
|
|
|
#define CANNOT_STEP_HW_WATCHPOINTS 0
|
|
|
|
|
#else
|
|
|
|
|
#undef CANNOT_STEP_HW_WATCHPOINTS
|
|
|
|
|
#define CANNOT_STEP_HW_WATCHPOINTS 1
|
|
|
|
|
#endif
|
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
/* Tables of how to react to signals; the user sets them. */
|
|
|
|
|
|
|
|
|
|
static unsigned char *signal_stop;
|
|
|
|
|
static unsigned char *signal_print;
|
|
|
|
|
static unsigned char *signal_program;
|
|
|
|
|
|
|
|
|
|
#define SET_SIGS(nsigs,sigs,flags) \
|
|
|
|
|
do { \
|
|
|
|
|
int signum = (nsigs); \
|
|
|
|
|
while (signum-- > 0) \
|
|
|
|
|
if ((sigs)[signum]) \
|
|
|
|
|
(flags)[signum] = 1; \
|
|
|
|
|
} while (0)
|
|
|
|
|
|
|
|
|
|
#define UNSET_SIGS(nsigs,sigs,flags) \
|
|
|
|
|
do { \
|
|
|
|
|
int signum = (nsigs); \
|
|
|
|
|
while (signum-- > 0) \
|
|
|
|
|
if ((sigs)[signum]) \
|
|
|
|
|
(flags)[signum] = 0; \
|
|
|
|
|
} while (0)
|
|
|
|
|
|
2001-05-04 12:15:33 +08:00
|
|
|
|
/* Value to pass to target_resume() to cause all threads to resume */
|
|
|
|
|
|
|
|
|
|
#define RESUME_ALL (pid_to_ptid (-1))
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
/* Command list pointer for the "stop" placeholder. */
|
|
|
|
|
|
|
|
|
|
static struct cmd_list_element *stop_command;
|
|
|
|
|
|
|
|
|
|
/* Function inferior was in as of last step command. */
|
|
|
|
|
|
|
|
|
|
static struct symbol *step_start_function;
|
|
|
|
|
|
|
|
|
|
/* Nonzero if we want to give control to the user when we're notified
|
|
|
|
|
of shared library events by the dynamic linker. */
|
|
|
|
|
static int stop_on_solib_events;
|
2005-02-24 Andrew Cagney <cagney@gnu.org>
Add show_VARIABLE functions, update add_setshow call.
* varobj.c (_initialize_varobj, show_varobjdebug): Add and update.
* valprint.c (_initialize_valprint, show_print_max)
(show_stop_print_at_null, show_repeat_count_threshold)
(show_prettyprint_structs, show_unionprint)
(show_prettyprint_arrays, show_addressprint, show_input_radix)
(show_output_radix): Ditto.
* valops.c (_initialize_valops, show_overload_resolution): Ditto.
* utils.c (initialize_utils, show_chars_per_line)
(show_lines_per_page, show_demangle, show_pagination_enabled)
(show_sevenbit_strings, show_asm_demangle): Ditto
* tui/tui-win.c (_initialize_tui_win, show_tui_border_kind)
(show_tui_border_mode, show_tui_active_border_mode): Ditto.
* top.c (init_main, show_new_async_prompt)
(show_async_command_editing_p, show_write_history_p)
(show_history_size, show_history_filename, show_caution)
(show_annotation_level, init_main): Ditto.
* target.c (initialize_targets, show_targetdebug)
(show_trust_readonly): Ditto.
* symfile.c (_initialize_symfile, show_symbol_reloading)
(show_ext_args, show_download_write_size)
(show_debug_file_directory): Ditto.
* source.c (_initialize_source, show_lines_to_list): Ditto.
* solib.c (_initialize_solib, show_auto_solib_add)
(show_solib_search_path): Ditto.
* p-valprint.c (_initialize_pascal_valprint)
(show_pascal_static_field_print): Ditto.
* printcmd.c (_initialize_printcmd, show_max_symbolic_offset)
(show_print_symbol_filename): Add and update.
* parse.c (_initialize_parse, show_expressiondebug): Dito.
* observer.c (_initialize_observer, show_observer_debug): Dito.
* maint.c (_initialize_maint_cmds, show_watchdog)
(show_maintenance_profile_p): Dito.
* linux-nat.c (_initialize_linux_nat, show_debug_linux_nat): Dito.
* infrun.c (_initialize_infrun, show_debug_infrun)
(show_stop_on_solib_events, show_follow_fork_mode_string)
(show_scheduler_mode, show_step_stop_if_no_debug): Ditto.
* infcall.c (_initialize_infcall, show_coerce_float_to_double_p)
(show_unwind_on_signal_p): Ditto.
* gdbtypes.c (build_gdbtypes, show_opaque_type_resolution)
(_initialize_gdbtypes, show_overload_debug): Ditto.
* gdb-events.c, gdb-events.sh (_initialize_gdb_events)
(show_gdb_events_debug): Ditto.
* gdbarch.c, gdbarch.sh (show_gdbarch_debug)
(_initialize_gdbarch): Ditto.
* frame.c (_initialize_frame, show_backtrace_past_main)
(show_backtrace_past_entry, show_backtrace_limit)
(show_frame_debug): Ditto.
* exec.c (_initialize_exec, show_write_files): Ditto.
* dwarf2read.c (_initialize_dwarf2_read)
(show_dwarf2_max_cache_age): Ditto.
* demangle.c (_initialize_demangler)
(show_demangling_style_names): Ditto.
* dcache.c (_initialize_dcache, show_dcache_enabled_p): Ditto.
* cp-valprint.c (show_static_field_print)
(_initialize_cp_valprint, show_vtblprint, show_objectprint): Ditto.
* corefile.c (_initialize_core, show_gnutarget_string): Ditto.
* cli/cli-logging.c (_initialize_cli_logging)
(show_logging_overwrite, show_logging_redirect)
(show_logging_filename): Ditto.
* cli/cli-cmds.c (show_info_verbose, show_history_expansion_p)
(init_cli_cmds, show_baud_rate, show_remote_debug)
(show_remote_timeout, show_max_user_call_depth): Ditto.
* charset.c (show_host_charset_name, show_target_charset_name)
(initialize_charset): Ditto.
* breakpoint.c (show_can_use_hw_watchpoints)
(show_pending_break_support, _initialize_breakpoint): Ditto.
2005-02-24 21:51:36 +08:00
|
|
|
|
static void
|
|
|
|
|
show_stop_on_solib_events (struct ui_file *file, int from_tty,
|
|
|
|
|
struct cmd_list_element *c, const char *value)
|
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (file, _("Stopping for shared library events is %s.\n"),
|
|
|
|
|
value);
|
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
/* Nonzero means expecting a trace trap
|
|
|
|
|
and should stop the inferior and return silently when it happens. */
|
|
|
|
|
|
|
|
|
|
int stop_after_trap;
|
|
|
|
|
|
2008-11-20 08:35:23 +08:00
|
|
|
|
/* Save register contents here when executing a "finish" command or are
|
|
|
|
|
about to pop a stack dummy frame, if-and-only-if proceed_to_finish is set.
|
1999-04-16 09:35:26 +08:00
|
|
|
|
Thus this contains the return value from the called function (assuming
|
|
|
|
|
values are returned in a register). */
|
|
|
|
|
|
2002-06-26 02:38:57 +08:00
|
|
|
|
struct regcache *stop_registers;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
/* Nonzero after stop if current stack frame should be printed. */
|
|
|
|
|
|
|
|
|
|
static int stop_print_frame;
|
|
|
|
|
|
2001-04-07 01:53:39 +08:00
|
|
|
|
/* This is a cached copy of the pid/waitstatus of the last event
|
2004-04-21 Andrew Cagney <cagney@redhat.com>
* annotate.h (deprecated_annotate_starting_hook)
(deprecated_annotate_stopped_hook)
(deprecated_annotate_exited_hook)
(deprecated_annotate_signal_hook)
(deprecated_annotate_signalled_hook): Deprecate.
* tracepoint.h (deprecated_create_tracepoint_hook)
(deprecated_delete_tracepoint_hook)
(deprecated_modify_tracepoint_hook)
(deprecated_trace_find_hook)
(deprecated_trace_start_stop_hook): Deprecate.
* target.h (deprecated_target_new_objfile_hook): Deprecate.
* remote.h (deprecated_target_resume_hook)
(deprecated_target_wait_loop_hook): Deprecate.
* gdbcore.h (deprecated_exec_file_display_hook)
(deprecated_file_changed_hook): Deprecate.
* frame.h (deprecated_selected_frame_level_changed_hook): Deprecate.
* defs.h (deprecated_modify_breakpoint_hook)
(deprecated_command_loop_hook, deprecated_show_load_progress)
(deprecated_print_frame_info_listing_hook)
(deprecated_query_hook, deprecated_warning_hook)
(deprecated_flush_hook, deprecated_create_breakpoint_hook)
(deprecated_delete_breakpoint_hook)
(deprecated_interactive_hook, deprecated_registers_changed_hook)
(deprecated_readline_begin_hook, deprecated_readline_hook)
(deprecated_readline_end_hook, deprecated_register_changed_hook)
(deprecated_memory_changed_hook, deprecated_init_ui_hook)
(deprecated_context_hook, deprecated_target_wait_hook)
(deprecated_attach_hook, deprecated_detach_hook)
(deprecated_call_command_hook, deprecated_set_hook)
(deprecated_error_hook, deprecated_error_begin_hook)
(deprecated_ui_load_progress_hook): Deprecate.
* valops.c, uw-thread.c, utils.c, tui/tui-io.c: Update.
* tui/tui-hooks.c, tracepoint.c, top.c, thread-db.c: Update.
* target.c, symfile.c, stack.c, sol-thread.c, rs6000-nat.c: Update.
* remote.c, remote-mips.c, regcache.c, mi/mi-interp.c: Update.
* main.c, interps.c, infcmd.c, hpux-thread.c, frame.c: Update.
* exec.c, dsrec.c, d10v-tdep.c, corefile.c, complaints.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, breakpoint.c: Update.
* annotate.c, aix-thread.c: Update.
2004-04-22 07:52:21 +08:00
|
|
|
|
returned by target_wait()/deprecated_target_wait_hook(). This
|
|
|
|
|
information is returned by get_last_target_status(). */
|
2001-05-04 12:15:33 +08:00
|
|
|
|
static ptid_t target_last_wait_ptid;
|
2001-04-07 01:53:39 +08:00
|
|
|
|
static struct target_waitstatus target_last_waitstatus;
|
|
|
|
|
|
Refactor infrun a bit.
* infrun.c (currently_stepping): Take a struct
thread_stepping_state instead of an execution_control_state.
(struct thread_stepping_state): New, split from
execution_control_state.
(gtss, tss): New globals.
(proceed): Clear the stepping state, set previous_inferior_ptid
and clear infwait state.
(init_wait_for_inferior): Clear the stepping state,
previous_inferior_ptid and infwait state.
(waiton_ptid, infwait_state): New, split from
execution_control_state.
(struct execution_control_state): Members that persist through
events moved out to either struct thred_stepping_state or made
global. Deleted unneeded wp, saved_inferior_ptid, tmpstatus.
(wait_for_inferior, fetch_inferior_event): Use local
execution_control_state. Update to execution_control_state split.
(init_execution_control_state): Adjust.
(init_thread_stepping_state): New, extracted from
init_execution_control_state.
(context_switch): Take a ptid instead of an
execution_control_state.
(context_switch_to): Adjust.
(adjust_pc_after_break): Adjust.
(init_infwait_state): New.
(handle_inferior_event): Adjust.
2008-07-10 06:33:16 +08:00
|
|
|
|
static void context_switch (ptid_t ptid);
|
|
|
|
|
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
void init_thread_stepping_state (struct thread_info *tss);
|
Refactor infrun a bit.
* infrun.c (currently_stepping): Take a struct
thread_stepping_state instead of an execution_control_state.
(struct thread_stepping_state): New, split from
execution_control_state.
(gtss, tss): New globals.
(proceed): Clear the stepping state, set previous_inferior_ptid
and clear infwait state.
(init_wait_for_inferior): Clear the stepping state,
previous_inferior_ptid and infwait state.
(waiton_ptid, infwait_state): New, split from
execution_control_state.
(struct execution_control_state): Members that persist through
events moved out to either struct thred_stepping_state or made
global. Deleted unneeded wp, saved_inferior_ptid, tmpstatus.
(wait_for_inferior, fetch_inferior_event): Use local
execution_control_state. Update to execution_control_state split.
(init_execution_control_state): Adjust.
(init_thread_stepping_state): New, extracted from
init_execution_control_state.
(context_switch): Take a ptid instead of an
execution_control_state.
(context_switch_to): Adjust.
(adjust_pc_after_break): Adjust.
(init_infwait_state): New.
(handle_inferior_event): Adjust.
2008-07-10 06:33:16 +08:00
|
|
|
|
|
|
|
|
|
void init_infwait_state (void);
|
Per-thread commands.
* gdbthread.h: Remove unneeded forward declarations.
Include "inferior.h".
(struct thread_info): Add continuations,
intermediate_continuations, proceed_to_finish, step_over_calls,
stop_step, step_multi and stop_signal members.
(save_infrun_state): Add continuations,
intermediate_continuations, proceed_to_finish, step_over_calls,
stop_step, step_multi, stop_signal and stop_bpstat parameters.
(load_infrun_state): Add continuations,
intermediate_continuations, proceed_to_finish, step_over_calls,
stop_step, step_multi, stop_signal and stop_bpstat parameters.
* thread.c (load_infrun_state): In non-stop mode, load
continuations, intermediate_continuations, proceed_to_finish,
step_over_calls, stop_step, step_multi and stop_signal.
(save_infrun_state): Store continuations,
intermediate_continuations, proceed_to_finish, step_over_calls,
stop_step, step_multi, stop_signal and stop_bpstat.
(save_infrun_state): Store continuations,
intermediate_continuations, proceed_to_finish, step_over_calls,
stop_step, step_multi, stop_signal and stop_bpstat.
(free_thread): Clear The thread's stop_bpstat.
* inferior.h (context_switch_to): Declare.
* infrun.c (ecss): New global.
(context_switch): Context switch continuations,
intermediate_continuations, proceed_to_finish, step_over_calls,
stop_step, step_multi, stop_signal and stop_bpstat.
(wait_for_inferior): Use global ecss.
(async_ecss, async_ecs): Delete.
(fetch_inferior_event): Use global ecss.
(context_switch_to): New.
* top.c (execute_command): In non-stop, only check if the current
thread is running, in all-stop, check if there's any thread
running.
* breakpoint.c (bpstat_remove_breakpoint): New.
(bpstat_remove_breakpoint_callback): New.
(delete_breakpoint): Clear the stop_bpstats of all threads.
* mi/mi-main.c (mi_cmd_execute): In non-stop, only check if the
current thread is running, in all-stop, check if there's any
thread running.
* Makefile.in (gdbthread_h): Depend on $(inferior_h).
2008-07-10 06:30:46 +08:00
|
|
|
|
|
2000-06-08 08:52:56 +08:00
|
|
|
|
static const char follow_fork_mode_child[] = "child";
|
|
|
|
|
static const char follow_fork_mode_parent[] = "parent";
|
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
static const char *follow_fork_mode_kind_names[] = {
|
2000-06-08 08:52:56 +08:00
|
|
|
|
follow_fork_mode_child,
|
|
|
|
|
follow_fork_mode_parent,
|
|
|
|
|
NULL
|
2000-04-20 19:00:34 +08:00
|
|
|
|
};
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2000-06-08 08:52:56 +08:00
|
|
|
|
static const char *follow_fork_mode_string = follow_fork_mode_parent;
|
2005-02-24 Andrew Cagney <cagney@gnu.org>
Add show_VARIABLE functions, update add_setshow call.
* varobj.c (_initialize_varobj, show_varobjdebug): Add and update.
* valprint.c (_initialize_valprint, show_print_max)
(show_stop_print_at_null, show_repeat_count_threshold)
(show_prettyprint_structs, show_unionprint)
(show_prettyprint_arrays, show_addressprint, show_input_radix)
(show_output_radix): Ditto.
* valops.c (_initialize_valops, show_overload_resolution): Ditto.
* utils.c (initialize_utils, show_chars_per_line)
(show_lines_per_page, show_demangle, show_pagination_enabled)
(show_sevenbit_strings, show_asm_demangle): Ditto
* tui/tui-win.c (_initialize_tui_win, show_tui_border_kind)
(show_tui_border_mode, show_tui_active_border_mode): Ditto.
* top.c (init_main, show_new_async_prompt)
(show_async_command_editing_p, show_write_history_p)
(show_history_size, show_history_filename, show_caution)
(show_annotation_level, init_main): Ditto.
* target.c (initialize_targets, show_targetdebug)
(show_trust_readonly): Ditto.
* symfile.c (_initialize_symfile, show_symbol_reloading)
(show_ext_args, show_download_write_size)
(show_debug_file_directory): Ditto.
* source.c (_initialize_source, show_lines_to_list): Ditto.
* solib.c (_initialize_solib, show_auto_solib_add)
(show_solib_search_path): Ditto.
* p-valprint.c (_initialize_pascal_valprint)
(show_pascal_static_field_print): Ditto.
* printcmd.c (_initialize_printcmd, show_max_symbolic_offset)
(show_print_symbol_filename): Add and update.
* parse.c (_initialize_parse, show_expressiondebug): Dito.
* observer.c (_initialize_observer, show_observer_debug): Dito.
* maint.c (_initialize_maint_cmds, show_watchdog)
(show_maintenance_profile_p): Dito.
* linux-nat.c (_initialize_linux_nat, show_debug_linux_nat): Dito.
* infrun.c (_initialize_infrun, show_debug_infrun)
(show_stop_on_solib_events, show_follow_fork_mode_string)
(show_scheduler_mode, show_step_stop_if_no_debug): Ditto.
* infcall.c (_initialize_infcall, show_coerce_float_to_double_p)
(show_unwind_on_signal_p): Ditto.
* gdbtypes.c (build_gdbtypes, show_opaque_type_resolution)
(_initialize_gdbtypes, show_overload_debug): Ditto.
* gdb-events.c, gdb-events.sh (_initialize_gdb_events)
(show_gdb_events_debug): Ditto.
* gdbarch.c, gdbarch.sh (show_gdbarch_debug)
(_initialize_gdbarch): Ditto.
* frame.c (_initialize_frame, show_backtrace_past_main)
(show_backtrace_past_entry, show_backtrace_limit)
(show_frame_debug): Ditto.
* exec.c (_initialize_exec, show_write_files): Ditto.
* dwarf2read.c (_initialize_dwarf2_read)
(show_dwarf2_max_cache_age): Ditto.
* demangle.c (_initialize_demangler)
(show_demangling_style_names): Ditto.
* dcache.c (_initialize_dcache, show_dcache_enabled_p): Ditto.
* cp-valprint.c (show_static_field_print)
(_initialize_cp_valprint, show_vtblprint, show_objectprint): Ditto.
* corefile.c (_initialize_core, show_gnutarget_string): Ditto.
* cli/cli-logging.c (_initialize_cli_logging)
(show_logging_overwrite, show_logging_redirect)
(show_logging_filename): Ditto.
* cli/cli-cmds.c (show_info_verbose, show_history_expansion_p)
(init_cli_cmds, show_baud_rate, show_remote_debug)
(show_remote_timeout, show_max_user_call_depth): Ditto.
* charset.c (show_host_charset_name, show_target_charset_name)
(initialize_charset): Ditto.
* breakpoint.c (show_can_use_hw_watchpoints)
(show_pending_break_support, _initialize_breakpoint): Ditto.
2005-02-24 21:51:36 +08:00
|
|
|
|
static void
|
|
|
|
|
show_follow_fork_mode_string (struct ui_file *file, int from_tty,
|
|
|
|
|
struct cmd_list_element *c, const char *value)
|
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (file, _("\
|
|
|
|
|
Debugger response to a program call of fork or vfork is \"%s\".\n"),
|
|
|
|
|
value);
|
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
|
2009-05-25 02:00:08 +08:00
|
|
|
|
/* Tell the target to follow the fork we're stopped at. Returns true
|
|
|
|
|
if the inferior should be resumed; false, if the target for some
|
|
|
|
|
reason decided it's best not to resume. */
|
|
|
|
|
|
2002-12-11 10:04:45 +08:00
|
|
|
|
static int
|
2003-01-10 02:03:38 +08:00
|
|
|
|
follow_fork (void)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
2004-01-14 05:31:43 +08:00
|
|
|
|
int follow_child = (follow_fork_mode_string == follow_fork_mode_child);
|
2009-05-25 02:00:08 +08:00
|
|
|
|
int should_resume = 1;
|
|
|
|
|
struct thread_info *tp;
|
|
|
|
|
|
|
|
|
|
/* Copy user stepping state to the new inferior thread. FIXME: the
|
|
|
|
|
followed fork child thread should have a copy of most of the
|
2009-05-25 04:55:33 +08:00
|
|
|
|
parent thread structure's run control related fields, not just these.
|
|
|
|
|
Initialized to avoid "may be used uninitialized" warnings from gcc. */
|
|
|
|
|
struct breakpoint *step_resume_breakpoint = NULL;
|
|
|
|
|
CORE_ADDR step_range_start = 0;
|
|
|
|
|
CORE_ADDR step_range_end = 0;
|
|
|
|
|
struct frame_id step_frame_id = { 0 };
|
2009-05-25 02:00:08 +08:00
|
|
|
|
|
|
|
|
|
if (!non_stop)
|
|
|
|
|
{
|
|
|
|
|
ptid_t wait_ptid;
|
|
|
|
|
struct target_waitstatus wait_status;
|
|
|
|
|
|
|
|
|
|
/* Get the last target status returned by target_wait(). */
|
|
|
|
|
get_last_target_status (&wait_ptid, &wait_status);
|
|
|
|
|
|
|
|
|
|
/* If not stopped at a fork event, then there's nothing else to
|
|
|
|
|
do. */
|
|
|
|
|
if (wait_status.kind != TARGET_WAITKIND_FORKED
|
|
|
|
|
&& wait_status.kind != TARGET_WAITKIND_VFORKED)
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
/* Check if we switched over from WAIT_PTID, since the event was
|
|
|
|
|
reported. */
|
|
|
|
|
if (!ptid_equal (wait_ptid, minus_one_ptid)
|
|
|
|
|
&& !ptid_equal (inferior_ptid, wait_ptid))
|
|
|
|
|
{
|
|
|
|
|
/* We did. Switch back to WAIT_PTID thread, to tell the
|
|
|
|
|
target to follow it (in either direction). We'll
|
|
|
|
|
afterwards refuse to resume, and inform the user what
|
|
|
|
|
happened. */
|
|
|
|
|
switch_to_thread (wait_ptid);
|
|
|
|
|
should_resume = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
tp = inferior_thread ();
|
|
|
|
|
|
|
|
|
|
/* If there were any forks/vforks that were caught and are now to be
|
|
|
|
|
followed, then do so now. */
|
|
|
|
|
switch (tp->pending_follow.kind)
|
|
|
|
|
{
|
|
|
|
|
case TARGET_WAITKIND_FORKED:
|
|
|
|
|
case TARGET_WAITKIND_VFORKED:
|
|
|
|
|
{
|
|
|
|
|
ptid_t parent, child;
|
|
|
|
|
|
|
|
|
|
/* If the user did a next/step, etc, over a fork call,
|
|
|
|
|
preserve the stepping state in the fork child. */
|
|
|
|
|
if (follow_child && should_resume)
|
|
|
|
|
{
|
|
|
|
|
step_resume_breakpoint
|
|
|
|
|
= clone_momentary_breakpoint (tp->step_resume_breakpoint);
|
|
|
|
|
step_range_start = tp->step_range_start;
|
|
|
|
|
step_range_end = tp->step_range_end;
|
|
|
|
|
step_frame_id = tp->step_frame_id;
|
|
|
|
|
|
|
|
|
|
/* For now, delete the parent's sr breakpoint, otherwise,
|
|
|
|
|
parent/child sr breakpoints are considered duplicates,
|
|
|
|
|
and the child version will not be installed. Remove
|
|
|
|
|
this when the breakpoints module becomes aware of
|
|
|
|
|
inferiors and address spaces. */
|
|
|
|
|
delete_step_resume_breakpoint (tp);
|
|
|
|
|
tp->step_range_start = 0;
|
|
|
|
|
tp->step_range_end = 0;
|
|
|
|
|
tp->step_frame_id = null_frame_id;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
parent = inferior_ptid;
|
|
|
|
|
child = tp->pending_follow.value.related_pid;
|
|
|
|
|
|
|
|
|
|
/* Tell the target to do whatever is necessary to follow
|
|
|
|
|
either parent or child. */
|
|
|
|
|
if (target_follow_fork (follow_child))
|
|
|
|
|
{
|
|
|
|
|
/* Target refused to follow, or there's some other reason
|
|
|
|
|
we shouldn't resume. */
|
|
|
|
|
should_resume = 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* This pending follow fork event is now handled, one way
|
|
|
|
|
or another. The previous selected thread may be gone
|
|
|
|
|
from the lists by now, but if it is still around, need
|
|
|
|
|
to clear the pending follow request. */
|
2009-05-25 05:06:53 +08:00
|
|
|
|
tp = find_thread_ptid (parent);
|
2009-05-25 02:00:08 +08:00
|
|
|
|
if (tp)
|
|
|
|
|
tp->pending_follow.kind = TARGET_WAITKIND_SPURIOUS;
|
|
|
|
|
|
|
|
|
|
/* This makes sure we don't try to apply the "Switched
|
|
|
|
|
over from WAIT_PID" logic above. */
|
|
|
|
|
nullify_last_target_wait_ptid ();
|
|
|
|
|
|
|
|
|
|
/* If we followed the child, switch to it... */
|
|
|
|
|
if (follow_child)
|
|
|
|
|
{
|
|
|
|
|
switch_to_thread (child);
|
|
|
|
|
|
|
|
|
|
/* ... and preserve the stepping state, in case the
|
|
|
|
|
user was stepping over the fork call. */
|
|
|
|
|
if (should_resume)
|
|
|
|
|
{
|
|
|
|
|
tp = inferior_thread ();
|
|
|
|
|
tp->step_resume_breakpoint = step_resume_breakpoint;
|
|
|
|
|
tp->step_range_start = step_range_start;
|
|
|
|
|
tp->step_range_end = step_range_end;
|
|
|
|
|
tp->step_frame_id = step_frame_id;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* If we get here, it was because we're trying to
|
|
|
|
|
resume from a fork catchpoint, but, the user
|
|
|
|
|
has switched threads away from the thread that
|
|
|
|
|
forked. In that case, the resume command
|
|
|
|
|
issued is most likely not applicable to the
|
|
|
|
|
child, so just warn, and refuse to resume. */
|
|
|
|
|
warning (_("\
|
|
|
|
|
Not resuming: switched threads before following fork child.\n"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Reset breakpoints in the child as appropriate. */
|
|
|
|
|
follow_inferior_reset_breakpoints ();
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
switch_to_thread (parent);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case TARGET_WAITKIND_SPURIOUS:
|
|
|
|
|
/* Nothing to follow. */
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
internal_error (__FILE__, __LINE__,
|
|
|
|
|
"Unexpected pending_follow.kind %d\n",
|
|
|
|
|
tp->pending_follow.kind);
|
|
|
|
|
break;
|
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2009-05-25 02:00:08 +08:00
|
|
|
|
return should_resume;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
2002-12-11 10:04:45 +08:00
|
|
|
|
void
|
|
|
|
|
follow_inferior_reset_breakpoints (void)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
struct thread_info *tp = inferior_thread ();
|
|
|
|
|
|
2002-12-11 10:04:45 +08:00
|
|
|
|
/* Was there a step_resume breakpoint? (There was if the user
|
|
|
|
|
did a "next" at the fork() call.) If so, explicitly reset its
|
|
|
|
|
thread number.
|
|
|
|
|
|
|
|
|
|
step_resumes are a form of bp that are made to be per-thread.
|
|
|
|
|
Since we created the step_resume bp when the parent process
|
|
|
|
|
was being debugged, and now are switching to the child process,
|
|
|
|
|
from the breakpoint package's viewpoint, that's a switch of
|
|
|
|
|
"threads". We must update the bp's notion of which thread
|
|
|
|
|
it is for, or it'll be ignored when it triggers. */
|
|
|
|
|
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
if (tp->step_resume_breakpoint)
|
|
|
|
|
breakpoint_re_set_thread (tp->step_resume_breakpoint);
|
2002-12-11 10:04:45 +08:00
|
|
|
|
|
|
|
|
|
/* Reinsert all breakpoints in the child. The user may have set
|
|
|
|
|
breakpoints after catching the fork, in which case those
|
|
|
|
|
were never set in the child, but only in the parent. This makes
|
|
|
|
|
sure the inserted breakpoints match the breakpoint list. */
|
|
|
|
|
|
|
|
|
|
breakpoint_re_set ();
|
|
|
|
|
insert_breakpoints ();
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
2001-01-27 08:43:26 +08:00
|
|
|
|
/* EXECD_PATHNAME is assumed to be non-NULL. */
|
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
static void
|
2008-07-10 06:23:05 +08:00
|
|
|
|
follow_exec (ptid_t pid, char *execd_pathname)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
1999-04-27 02:34:20 +08:00
|
|
|
|
struct target_ops *tgt;
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
struct thread_info *th = inferior_thread ();
|
1999-04-27 02:34:20 +08:00
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
/* This is an exec event that we actually wish to pay attention to.
|
|
|
|
|
Refresh our symbol table to the newly exec'd program, remove any
|
|
|
|
|
momentary bp's, etc.
|
|
|
|
|
|
|
|
|
|
If there are breakpoints, they aren't really inserted now,
|
|
|
|
|
since the exec() transformed our inferior into a fresh set
|
|
|
|
|
of instructions.
|
|
|
|
|
|
|
|
|
|
We want to preserve symbolic breakpoints on the list, since
|
|
|
|
|
we have hopes that they can be reset after the new a.out's
|
|
|
|
|
symbol table is read.
|
|
|
|
|
|
|
|
|
|
However, any "raw" breakpoints must be removed from the list
|
|
|
|
|
(e.g., the solib bp's), since their address is probably invalid
|
|
|
|
|
now.
|
|
|
|
|
|
|
|
|
|
And, we DON'T want to call delete_breakpoints() here, since
|
|
|
|
|
that may write the bp's "shadow contents" (the instruction
|
|
|
|
|
value that was overwritten witha TRAP instruction). Since
|
|
|
|
|
we now have a new a.out, those shadow contents aren't valid. */
|
|
|
|
|
update_breakpoints_after_exec ();
|
|
|
|
|
|
|
|
|
|
/* If there was one, it's gone now. We cannot truly step-to-next
|
|
|
|
|
statement through an exec(). */
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
th->step_resume_breakpoint = NULL;
|
|
|
|
|
th->step_range_start = 0;
|
|
|
|
|
th->step_range_end = 0;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2009-05-28 03:44:53 +08:00
|
|
|
|
/* The target reports the exec event to the main thread, even if
|
|
|
|
|
some other thread does the exec, and even if the main thread was
|
|
|
|
|
already stopped --- if debugging in non-stop mode, it's possible
|
|
|
|
|
the user had the main thread held stopped in the previous image
|
|
|
|
|
--- release it now. This is the same behavior as step-over-exec
|
|
|
|
|
with scheduler-locking on in all-stop mode. */
|
|
|
|
|
th->stop_requested = 0;
|
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
/* What is this a.out's name? */
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up some of printf_filtered and printf_unfiltered.
* ada-lang.c, annotate.c, arch-utils.c, breakpoint.c: Update.
* corelow.c, cp-namespace.c, cp-support.c, dcache.c: Update.
* demangle.c, dsrec.c, dwarf2read.c, dwarfread.c: Update.
* event-loop.c, event-top.c, exec.c, f-valprint.c: Update.
* gdbtypes.c, inf-loop.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcmd.c, inflow.c, infrun.c, inftarg.c, language.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, maint.c: Update.
* mdebugread.c, memattr.c, monitor.c, objc-lang.c: Update.
* ocd.c, osabi.c, printcmd.c, procfs.c, regcache.c: Update.
* remote.c, solib-som.c, solib.c, somsolib.c, source.c: Update.
* stack.c, symfile.c, symmisc.c, target.c, thread.c: Update.
* top.c, utils.c, valprint.c, value.c, cli/cli-cmds.c: Update.
* cli/cli-dump.c, cli/cli-logging.c, tui/tui-hooks.c: Update.
* tui/tui-regs.c, tui/tui-win.c: Update.
2005-02-12 08:39:24 +08:00
|
|
|
|
printf_unfiltered (_("Executing new program: %s\n"), execd_pathname);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
/* We've followed the inferior through an exec. Therefore, the
|
|
|
|
|
inferior has essentially been killed & reborn. */
|
1999-04-27 02:34:20 +08:00
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
gdb_flush (gdb_stdout);
|
2008-09-22 23:26:53 +08:00
|
|
|
|
|
|
|
|
|
breakpoint_init_inferior (inf_execd);
|
2008-01-30 06:47:20 +08:00
|
|
|
|
|
|
|
|
|
if (gdb_sysroot && *gdb_sysroot)
|
|
|
|
|
{
|
|
|
|
|
char *name = alloca (strlen (gdb_sysroot)
|
|
|
|
|
+ strlen (execd_pathname)
|
|
|
|
|
+ 1);
|
|
|
|
|
strcpy (name, gdb_sysroot);
|
|
|
|
|
strcat (name, execd_pathname);
|
|
|
|
|
execd_pathname = name;
|
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
/* That a.out is now the one to use. */
|
|
|
|
|
exec_file_attach (execd_pathname, 0);
|
|
|
|
|
|
2008-07-08 18:31:16 +08:00
|
|
|
|
/* Reset the shared library package. This ensures that we get a
|
|
|
|
|
shlib event when the child reaches "_start", at which point the
|
|
|
|
|
dld will have had a chance to initialize the child. */
|
|
|
|
|
/* Also, loading a symbol file below may trigger symbol lookups, and
|
|
|
|
|
we don't want those to be satisfied by the libraries of the
|
|
|
|
|
previous incarnation of this process. */
|
|
|
|
|
no_shared_libraries (NULL, 0);
|
|
|
|
|
|
|
|
|
|
/* Load the main file's symbols. */
|
2001-01-27 08:43:26 +08:00
|
|
|
|
symbol_file_add_main (execd_pathname, 0);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
1999-04-27 02:34:20 +08:00
|
|
|
|
#ifdef SOLIB_CREATE_INFERIOR_HOOK
|
2001-05-04 12:15:33 +08:00
|
|
|
|
SOLIB_CREATE_INFERIOR_HOOK (PIDGET (inferior_ptid));
|
* solib.h (CLEAR_SOLIB, SOLIB_ADD)
(SOLIB_CREATE_INFERIOR_HOOK, SOLIB_REMOVE_INFERIOR_HOOK)
(SOLIB_IN_DYNAMIC_LINKER, SOLIB_RESTART)
(DISABLE_UNSETTABLE_BREAK, PC_SOLIB)
(IN_SOLIB_DYNSYM_RESOLVE_CODE): Remove defines and orphaned
comments.
* breakpoint.c: Include "solib.h".
(insert_bp_location) [!DISABLE_UNSETTABLE_BREAK]: Call
solib_address.
(remove_solib_event_breakpoints, create_solib_event_breakpoint)
(disable_breakpoints_in_shlibs)
(disable_breakpoints_in_unloaded_shlib)
(re_enable_breakpoints_in_shlibs): Compile if SOLIB_ADD isn't
defined. If PC_SOLIB isn't defined, call solib_address.
(_initialize_breakpoint): Unconditionally install observer.
* corelow.c: Include "solib.h".
[SOLIB_ADD] (solib_add_stub): Remove prototype.
(core_close) [!CLEAR_SOLIB]: Call clear_solib.
(solib_add_stub) [!SOLIB_ADD] Call solib_add.
(core_open): Unconditionally call solib_add_stub.
* fork-child.c: Include "solib.h".
(fork_inferior) [!SOLIB_CREATE_INFERIOR_HOOK]: Call
solib_create_inferior_hook.
* infcmd.c: Include "solib.h".
(attach_command) [!SOLIB_ADD]: Call shlib_rescan. Unconditionally
call re_enable_breakpoints_in_shlibs.
* infrun.c: Include "solib.h".
(SOLIB_IN_SYNSYM_RESOLVE_CODE): Don't define if not already
defined.
(stop_on_solib_events, show_stop_on_solib_events): Include
unconditionally.
(follow_exec) [!SOLIB_CREATE_INFERIOR_HOOK]: Call
solib_create_inferior_hook.
(handle_inferior_event) [!SOLIB_ADD]: Call shlib_add.
[!IN_SOLIB_DYNSYM_RESOLVE_CODE]: Call in_solib_dynsym_resolve_code.
(_initialize_infrun): Unconditionally add "stop_on_solib-events"
command.
* remote.c: Include "solib.h".
(remote_open_1): Unconditionally call no_shared_libraries.
[!SOLIB_CREATE_INFERIOR_HOOK] Call solib_create_inferior_hook.
* stack.c: Include "solib.h".
(print_frame) [!PC_SOLIB] Call shlib_for_pc.
* xcoffsolib.c (no_shared_libraries): Remove function.
* Makefile.in (SFILES): Add solib.c.
(ALLDEPFILES): Remove solib.c.
(COMMON_OBS): Add solib.o.
(breakpoint.o, corelow.o, fork-chiled.o, infcmd.o, infrun.o)
(remote.o, stack.o): Update dependencies.
2005-05-13 04:21:18 +08:00
|
|
|
|
#else
|
|
|
|
|
solib_create_inferior_hook ();
|
1999-04-27 02:34:20 +08:00
|
|
|
|
#endif
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
/* Reinsert all breakpoints. (Those which were symbolic have
|
|
|
|
|
been reset to the proper address in the new a.out, thanks
|
|
|
|
|
to symbol_file_command...) */
|
|
|
|
|
insert_breakpoints ();
|
|
|
|
|
|
|
|
|
|
/* The next resume of this inferior should bring it to the shlib
|
|
|
|
|
startup breakpoints. (If the user had also set bp's on
|
|
|
|
|
"main" from the old (parent) process, then they'll auto-
|
|
|
|
|
matically get reset there in the new process.) */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Non-zero if we just simulating a single-step. This is needed
|
|
|
|
|
because we cannot remove the breakpoints in the inferior process
|
|
|
|
|
until after the `wait' in `wait_for_inferior'. */
|
|
|
|
|
static int singlestep_breakpoints_inserted_p = 0;
|
2004-02-17 04:49:51 +08:00
|
|
|
|
|
|
|
|
|
/* The thread we inserted single-step breakpoints for. */
|
|
|
|
|
static ptid_t singlestep_ptid;
|
|
|
|
|
|
2007-01-11 04:10:23 +08:00
|
|
|
|
/* PC when we started this single-step. */
|
|
|
|
|
static CORE_ADDR singlestep_pc;
|
|
|
|
|
|
2004-02-17 04:49:51 +08:00
|
|
|
|
/* If another thread hit the singlestep breakpoint, we save the original
|
|
|
|
|
thread here so that we can resume single-stepping it later. */
|
|
|
|
|
static ptid_t saved_singlestep_ptid;
|
|
|
|
|
static int stepping_past_singlestep_breakpoint;
|
2007-09-11 02:49:26 +08:00
|
|
|
|
|
2007-12-06 20:57:51 +08:00
|
|
|
|
/* If not equal to null_ptid, this means that after stepping over breakpoint
|
|
|
|
|
is finished, we need to switch to deferred_step_ptid, and step it.
|
|
|
|
|
|
|
|
|
|
The use case is when one thread has hit a breakpoint, and then the user
|
|
|
|
|
has switched to another thread and issued 'step'. We need to step over
|
|
|
|
|
breakpoint in the thread which hit the breakpoint, but then continue
|
|
|
|
|
stepping the thread user has selected. */
|
|
|
|
|
static ptid_t deferred_step_ptid;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
/* Displaced stepping. */
|
|
|
|
|
|
|
|
|
|
/* In non-stop debugging mode, we must take special care to manage
|
|
|
|
|
breakpoints properly; in particular, the traditional strategy for
|
|
|
|
|
stepping a thread past a breakpoint it has hit is unsuitable.
|
|
|
|
|
'Displaced stepping' is a tactic for stepping one thread past a
|
|
|
|
|
breakpoint it has hit while ensuring that other threads running
|
|
|
|
|
concurrently will hit the breakpoint as they should.
|
|
|
|
|
|
|
|
|
|
The traditional way to step a thread T off a breakpoint in a
|
|
|
|
|
multi-threaded program in all-stop mode is as follows:
|
|
|
|
|
|
|
|
|
|
a0) Initially, all threads are stopped, and breakpoints are not
|
|
|
|
|
inserted.
|
|
|
|
|
a1) We single-step T, leaving breakpoints uninserted.
|
|
|
|
|
a2) We insert breakpoints, and resume all threads.
|
|
|
|
|
|
|
|
|
|
In non-stop debugging, however, this strategy is unsuitable: we
|
|
|
|
|
don't want to have to stop all threads in the system in order to
|
|
|
|
|
continue or step T past a breakpoint. Instead, we use displaced
|
|
|
|
|
stepping:
|
|
|
|
|
|
|
|
|
|
n0) Initially, T is stopped, other threads are running, and
|
|
|
|
|
breakpoints are inserted.
|
|
|
|
|
n1) We copy the instruction "under" the breakpoint to a separate
|
|
|
|
|
location, outside the main code stream, making any adjustments
|
|
|
|
|
to the instruction, register, and memory state as directed by
|
|
|
|
|
T's architecture.
|
|
|
|
|
n2) We single-step T over the instruction at its new location.
|
|
|
|
|
n3) We adjust the resulting register and memory state as directed
|
|
|
|
|
by T's architecture. This includes resetting T's PC to point
|
|
|
|
|
back into the main instruction stream.
|
|
|
|
|
n4) We resume T.
|
|
|
|
|
|
|
|
|
|
This approach depends on the following gdbarch methods:
|
|
|
|
|
|
|
|
|
|
- gdbarch_max_insn_length and gdbarch_displaced_step_location
|
|
|
|
|
indicate where to copy the instruction, and how much space must
|
|
|
|
|
be reserved there. We use these in step n1.
|
|
|
|
|
|
|
|
|
|
- gdbarch_displaced_step_copy_insn copies a instruction to a new
|
|
|
|
|
address, and makes any necessary adjustments to the instruction,
|
|
|
|
|
register contents, and memory. We use this in step n1.
|
|
|
|
|
|
|
|
|
|
- gdbarch_displaced_step_fixup adjusts registers and memory after
|
|
|
|
|
we have successfuly single-stepped the instruction, to yield the
|
|
|
|
|
same effect the instruction would have had if we had executed it
|
|
|
|
|
at its original address. We use this in step n3.
|
|
|
|
|
|
|
|
|
|
- gdbarch_displaced_step_free_closure provides cleanup.
|
|
|
|
|
|
|
|
|
|
The gdbarch_displaced_step_copy_insn and
|
|
|
|
|
gdbarch_displaced_step_fixup functions must be written so that
|
|
|
|
|
copying an instruction with gdbarch_displaced_step_copy_insn,
|
|
|
|
|
single-stepping across the copied instruction, and then applying
|
|
|
|
|
gdbarch_displaced_insn_fixup should have the same effects on the
|
|
|
|
|
thread's memory and registers as stepping the instruction in place
|
|
|
|
|
would have. Exactly which responsibilities fall to the copy and
|
|
|
|
|
which fall to the fixup is up to the author of those functions.
|
|
|
|
|
|
|
|
|
|
See the comments in gdbarch.sh for details.
|
|
|
|
|
|
|
|
|
|
Note that displaced stepping and software single-step cannot
|
|
|
|
|
currently be used in combination, although with some care I think
|
|
|
|
|
they could be made to. Software single-step works by placing
|
|
|
|
|
breakpoints on all possible subsequent instructions; if the
|
|
|
|
|
displaced instruction is a PC-relative jump, those breakpoints
|
|
|
|
|
could fall in very strange places --- on pages that aren't
|
|
|
|
|
executable, or at addresses that are not proper instruction
|
|
|
|
|
boundaries. (We do generally let other threads run while we wait
|
|
|
|
|
to hit the software single-step breakpoint, and they might
|
|
|
|
|
encounter such a corrupted instruction.) One way to work around
|
|
|
|
|
this would be to have gdbarch_displaced_step_copy_insn fully
|
|
|
|
|
simulate the effect of PC-relative instructions (and return NULL)
|
|
|
|
|
on architectures that use software single-stepping.
|
|
|
|
|
|
|
|
|
|
In non-stop mode, we can have independent and simultaneous step
|
|
|
|
|
requests, so more than one thread may need to simultaneously step
|
|
|
|
|
over a breakpoint. The current implementation assumes there is
|
|
|
|
|
only one scratch space per process. In this case, we have to
|
|
|
|
|
serialize access to the scratch space. If thread A wants to step
|
|
|
|
|
over a breakpoint, but we are currently waiting for some other
|
|
|
|
|
thread to complete a displaced step, we leave thread A stopped and
|
|
|
|
|
place it in the displaced_step_request_queue. Whenever a displaced
|
|
|
|
|
step finishes, we pick the next thread in the queue and start a new
|
|
|
|
|
displaced step operation on it. See displaced_step_prepare and
|
|
|
|
|
displaced_step_fixup for details. */
|
|
|
|
|
|
|
|
|
|
/* If this is not null_ptid, this is the thread carrying out a
|
|
|
|
|
displaced single-step. This thread's state will require fixing up
|
|
|
|
|
once it has completed its step. */
|
|
|
|
|
static ptid_t displaced_step_ptid;
|
|
|
|
|
|
|
|
|
|
struct displaced_step_request
|
|
|
|
|
{
|
|
|
|
|
ptid_t ptid;
|
|
|
|
|
struct displaced_step_request *next;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* A queue of pending displaced stepping requests. */
|
|
|
|
|
struct displaced_step_request *displaced_step_request_queue;
|
|
|
|
|
|
|
|
|
|
/* The architecture the thread had when we stepped it. */
|
|
|
|
|
static struct gdbarch *displaced_step_gdbarch;
|
|
|
|
|
|
|
|
|
|
/* The closure provided gdbarch_displaced_step_copy_insn, to be used
|
|
|
|
|
for post-step cleanup. */
|
|
|
|
|
static struct displaced_step_closure *displaced_step_closure;
|
|
|
|
|
|
|
|
|
|
/* The address of the original instruction, and the copy we made. */
|
|
|
|
|
static CORE_ADDR displaced_step_original, displaced_step_copy;
|
|
|
|
|
|
|
|
|
|
/* Saved contents of copy area. */
|
|
|
|
|
static gdb_byte *displaced_step_saved_copy;
|
|
|
|
|
|
2008-10-24 10:31:41 +08:00
|
|
|
|
/* Enum strings for "set|show displaced-stepping". */
|
|
|
|
|
|
|
|
|
|
static const char can_use_displaced_stepping_auto[] = "auto";
|
|
|
|
|
static const char can_use_displaced_stepping_on[] = "on";
|
|
|
|
|
static const char can_use_displaced_stepping_off[] = "off";
|
|
|
|
|
static const char *can_use_displaced_stepping_enum[] =
|
|
|
|
|
{
|
|
|
|
|
can_use_displaced_stepping_auto,
|
|
|
|
|
can_use_displaced_stepping_on,
|
|
|
|
|
can_use_displaced_stepping_off,
|
|
|
|
|
NULL,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* If ON, and the architecture supports it, GDB will use displaced
|
|
|
|
|
stepping to step over breakpoints. If OFF, or if the architecture
|
|
|
|
|
doesn't support it, GDB will instead use the traditional
|
|
|
|
|
hold-and-step approach. If AUTO (which is the default), GDB will
|
|
|
|
|
decide which technique to use to step over breakpoints depending on
|
|
|
|
|
which of all-stop or non-stop mode is active --- displaced stepping
|
|
|
|
|
in non-stop mode; hold-and-step in all-stop mode. */
|
|
|
|
|
|
|
|
|
|
static const char *can_use_displaced_stepping =
|
|
|
|
|
can_use_displaced_stepping_auto;
|
|
|
|
|
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
static void
|
|
|
|
|
show_can_use_displaced_stepping (struct ui_file *file, int from_tty,
|
|
|
|
|
struct cmd_list_element *c,
|
|
|
|
|
const char *value)
|
|
|
|
|
{
|
2008-10-24 10:31:41 +08:00
|
|
|
|
if (can_use_displaced_stepping == can_use_displaced_stepping_auto)
|
|
|
|
|
fprintf_filtered (file, _("\
|
|
|
|
|
Debugger's willingness to use displaced stepping to step over \
|
|
|
|
|
breakpoints is %s (currently %s).\n"),
|
|
|
|
|
value, non_stop ? "on" : "off");
|
|
|
|
|
else
|
|
|
|
|
fprintf_filtered (file, _("\
|
|
|
|
|
Debugger's willingness to use displaced stepping to step over \
|
|
|
|
|
breakpoints is %s.\n"), value);
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
}
|
|
|
|
|
|
2008-10-24 10:31:41 +08:00
|
|
|
|
/* Return non-zero if displaced stepping can/should be used to step
|
|
|
|
|
over breakpoints. */
|
|
|
|
|
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
static int
|
|
|
|
|
use_displaced_stepping (struct gdbarch *gdbarch)
|
|
|
|
|
{
|
2008-10-24 10:31:41 +08:00
|
|
|
|
return (((can_use_displaced_stepping == can_use_displaced_stepping_auto
|
|
|
|
|
&& non_stop)
|
|
|
|
|
|| can_use_displaced_stepping == can_use_displaced_stepping_on)
|
2009-04-30 11:09:59 +08:00
|
|
|
|
&& gdbarch_displaced_step_copy_insn_p (gdbarch)
|
|
|
|
|
&& !RECORD_IS_USED);
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Clean out any stray displaced stepping state. */
|
|
|
|
|
static void
|
|
|
|
|
displaced_step_clear (void)
|
|
|
|
|
{
|
|
|
|
|
/* Indicate that there is no cleanup pending. */
|
|
|
|
|
displaced_step_ptid = null_ptid;
|
|
|
|
|
|
|
|
|
|
if (displaced_step_closure)
|
|
|
|
|
{
|
|
|
|
|
gdbarch_displaced_step_free_closure (displaced_step_gdbarch,
|
|
|
|
|
displaced_step_closure);
|
|
|
|
|
displaced_step_closure = NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
cleanup_displaced_step_closure (void *ptr)
|
|
|
|
|
{
|
|
|
|
|
struct displaced_step_closure *closure = ptr;
|
|
|
|
|
|
|
|
|
|
gdbarch_displaced_step_free_closure (current_gdbarch, closure);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Dump LEN bytes at BUF in hex to FILE, followed by a newline. */
|
|
|
|
|
void
|
|
|
|
|
displaced_step_dump_bytes (struct ui_file *file,
|
|
|
|
|
const gdb_byte *buf,
|
|
|
|
|
size_t len)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < len; i++)
|
|
|
|
|
fprintf_unfiltered (file, "%02x ", buf[i]);
|
|
|
|
|
fputs_unfiltered ("\n", file);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Prepare to single-step, using displaced stepping.
|
|
|
|
|
|
|
|
|
|
Note that we cannot use displaced stepping when we have a signal to
|
|
|
|
|
deliver. If we have a signal to deliver and an instruction to step
|
|
|
|
|
over, then after the step, there will be no indication from the
|
|
|
|
|
target whether the thread entered a signal handler or ignored the
|
|
|
|
|
signal and stepped over the instruction successfully --- both cases
|
|
|
|
|
result in a simple SIGTRAP. In the first case we mustn't do a
|
|
|
|
|
fixup, and in the second case we must --- but we can't tell which.
|
|
|
|
|
Comments in the code for 'random signals' in handle_inferior_event
|
|
|
|
|
explain how we handle this case instead.
|
|
|
|
|
|
|
|
|
|
Returns 1 if preparing was successful -- this thread is going to be
|
|
|
|
|
stepped now; or 0 if displaced stepping this thread got queued. */
|
|
|
|
|
static int
|
|
|
|
|
displaced_step_prepare (ptid_t ptid)
|
|
|
|
|
{
|
2008-10-15 07:39:29 +08:00
|
|
|
|
struct cleanup *old_cleanups, *ignore_cleanups;
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
struct regcache *regcache = get_thread_regcache (ptid);
|
|
|
|
|
struct gdbarch *gdbarch = get_regcache_arch (regcache);
|
|
|
|
|
CORE_ADDR original, copy;
|
|
|
|
|
ULONGEST len;
|
|
|
|
|
struct displaced_step_closure *closure;
|
|
|
|
|
|
|
|
|
|
/* We should never reach this function if the architecture does not
|
|
|
|
|
support displaced stepping. */
|
|
|
|
|
gdb_assert (gdbarch_displaced_step_copy_insn_p (gdbarch));
|
|
|
|
|
|
|
|
|
|
/* For the first cut, we're displaced stepping one thread at a
|
|
|
|
|
time. */
|
|
|
|
|
|
|
|
|
|
if (!ptid_equal (displaced_step_ptid, null_ptid))
|
|
|
|
|
{
|
|
|
|
|
/* Already waiting for a displaced step to finish. Defer this
|
|
|
|
|
request and place in queue. */
|
|
|
|
|
struct displaced_step_request *req, *new_req;
|
|
|
|
|
|
|
|
|
|
if (debug_displaced)
|
|
|
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
|
|
|
"displaced: defering step of %s\n",
|
|
|
|
|
target_pid_to_str (ptid));
|
|
|
|
|
|
|
|
|
|
new_req = xmalloc (sizeof (*new_req));
|
|
|
|
|
new_req->ptid = ptid;
|
|
|
|
|
new_req->next = NULL;
|
|
|
|
|
|
|
|
|
|
if (displaced_step_request_queue)
|
|
|
|
|
{
|
|
|
|
|
for (req = displaced_step_request_queue;
|
|
|
|
|
req && req->next;
|
|
|
|
|
req = req->next)
|
|
|
|
|
;
|
|
|
|
|
req->next = new_req;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
displaced_step_request_queue = new_req;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (debug_displaced)
|
|
|
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
|
|
|
"displaced: stepping %s now\n",
|
|
|
|
|
target_pid_to_str (ptid));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
displaced_step_clear ();
|
|
|
|
|
|
2008-10-15 07:39:29 +08:00
|
|
|
|
old_cleanups = save_inferior_ptid ();
|
|
|
|
|
inferior_ptid = ptid;
|
|
|
|
|
|
2008-05-04 22:12:34 +08:00
|
|
|
|
original = regcache_read_pc (regcache);
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
|
|
|
|
|
copy = gdbarch_displaced_step_location (gdbarch);
|
|
|
|
|
len = gdbarch_max_insn_length (gdbarch);
|
|
|
|
|
|
|
|
|
|
/* Save the original contents of the copy area. */
|
|
|
|
|
displaced_step_saved_copy = xmalloc (len);
|
2008-10-15 07:39:29 +08:00
|
|
|
|
ignore_cleanups = make_cleanup (free_current_contents,
|
|
|
|
|
&displaced_step_saved_copy);
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
read_memory (copy, displaced_step_saved_copy, len);
|
|
|
|
|
if (debug_displaced)
|
|
|
|
|
{
|
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "displaced: saved 0x%s: ",
|
|
|
|
|
paddr_nz (copy));
|
|
|
|
|
displaced_step_dump_bytes (gdb_stdlog, displaced_step_saved_copy, len);
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
closure = gdbarch_displaced_step_copy_insn (gdbarch,
|
2008-10-15 07:39:29 +08:00
|
|
|
|
original, copy, regcache);
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
|
|
|
|
|
/* We don't support the fully-simulated case at present. */
|
|
|
|
|
gdb_assert (closure);
|
|
|
|
|
|
|
|
|
|
make_cleanup (cleanup_displaced_step_closure, closure);
|
|
|
|
|
|
|
|
|
|
/* Resume execution at the copy. */
|
2008-05-04 22:12:34 +08:00
|
|
|
|
regcache_write_pc (regcache, copy);
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
|
2008-10-15 07:39:29 +08:00
|
|
|
|
discard_cleanups (ignore_cleanups);
|
|
|
|
|
|
|
|
|
|
do_cleanups (old_cleanups);
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
|
|
|
|
|
if (debug_displaced)
|
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "displaced: displaced pc to 0x%s\n",
|
2008-10-15 07:39:29 +08:00
|
|
|
|
paddr_nz (copy));
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
|
|
|
|
|
/* Save the information we need to fix things up if the step
|
|
|
|
|
succeeds. */
|
|
|
|
|
displaced_step_ptid = ptid;
|
|
|
|
|
displaced_step_gdbarch = gdbarch;
|
|
|
|
|
displaced_step_closure = closure;
|
|
|
|
|
displaced_step_original = original;
|
|
|
|
|
displaced_step_copy = copy;
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
displaced_step_clear_cleanup (void *ignore)
|
|
|
|
|
{
|
|
|
|
|
displaced_step_clear ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
write_memory_ptid (ptid_t ptid, CORE_ADDR memaddr, const gdb_byte *myaddr, int len)
|
|
|
|
|
{
|
|
|
|
|
struct cleanup *ptid_cleanup = save_inferior_ptid ();
|
|
|
|
|
inferior_ptid = ptid;
|
|
|
|
|
write_memory (memaddr, myaddr, len);
|
|
|
|
|
do_cleanups (ptid_cleanup);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
displaced_step_fixup (ptid_t event_ptid, enum target_signal signal)
|
|
|
|
|
{
|
|
|
|
|
struct cleanup *old_cleanups;
|
|
|
|
|
|
|
|
|
|
/* Was this event for the pid we displaced? */
|
|
|
|
|
if (ptid_equal (displaced_step_ptid, null_ptid)
|
|
|
|
|
|| ! ptid_equal (displaced_step_ptid, event_ptid))
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
old_cleanups = make_cleanup (displaced_step_clear_cleanup, 0);
|
|
|
|
|
|
|
|
|
|
/* Restore the contents of the copy area. */
|
|
|
|
|
{
|
|
|
|
|
ULONGEST len = gdbarch_max_insn_length (displaced_step_gdbarch);
|
|
|
|
|
write_memory_ptid (displaced_step_ptid, displaced_step_copy,
|
|
|
|
|
displaced_step_saved_copy, len);
|
|
|
|
|
if (debug_displaced)
|
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "displaced: restored 0x%s\n",
|
|
|
|
|
paddr_nz (displaced_step_copy));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Did the instruction complete successfully? */
|
|
|
|
|
if (signal == TARGET_SIGNAL_TRAP)
|
|
|
|
|
{
|
|
|
|
|
/* Fix up the resulting state. */
|
|
|
|
|
gdbarch_displaced_step_fixup (displaced_step_gdbarch,
|
|
|
|
|
displaced_step_closure,
|
|
|
|
|
displaced_step_original,
|
|
|
|
|
displaced_step_copy,
|
|
|
|
|
get_thread_regcache (displaced_step_ptid));
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Since the instruction didn't complete, all we can do is
|
|
|
|
|
relocate the PC. */
|
2008-05-04 22:12:34 +08:00
|
|
|
|
struct regcache *regcache = get_thread_regcache (event_ptid);
|
|
|
|
|
CORE_ADDR pc = regcache_read_pc (regcache);
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
pc = displaced_step_original + (pc - displaced_step_copy);
|
2008-05-04 22:12:34 +08:00
|
|
|
|
regcache_write_pc (regcache, pc);
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
do_cleanups (old_cleanups);
|
|
|
|
|
|
2008-10-16 03:15:34 +08:00
|
|
|
|
displaced_step_ptid = null_ptid;
|
|
|
|
|
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
/* Are there any pending displaced stepping requests? If so, run
|
|
|
|
|
one now. */
|
2008-10-16 03:15:34 +08:00
|
|
|
|
while (displaced_step_request_queue)
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
{
|
|
|
|
|
struct displaced_step_request *head;
|
|
|
|
|
ptid_t ptid;
|
2008-10-16 03:15:34 +08:00
|
|
|
|
CORE_ADDR actual_pc;
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
|
|
|
|
|
head = displaced_step_request_queue;
|
|
|
|
|
ptid = head->ptid;
|
|
|
|
|
displaced_step_request_queue = head->next;
|
|
|
|
|
xfree (head);
|
|
|
|
|
|
2008-10-15 07:39:29 +08:00
|
|
|
|
context_switch (ptid);
|
|
|
|
|
|
2009-05-05 21:24:49 +08:00
|
|
|
|
actual_pc = regcache_read_pc (get_thread_regcache (ptid));
|
2008-10-16 03:15:34 +08:00
|
|
|
|
|
|
|
|
|
if (breakpoint_here_p (actual_pc))
|
2008-10-15 07:39:29 +08:00
|
|
|
|
{
|
2008-10-16 03:15:34 +08:00
|
|
|
|
if (debug_displaced)
|
|
|
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
|
|
|
"displaced: stepping queued %s now\n",
|
|
|
|
|
target_pid_to_str (ptid));
|
|
|
|
|
|
|
|
|
|
displaced_step_prepare (ptid);
|
|
|
|
|
|
|
|
|
|
if (debug_displaced)
|
|
|
|
|
{
|
|
|
|
|
gdb_byte buf[4];
|
|
|
|
|
|
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "displaced: run 0x%s: ",
|
|
|
|
|
paddr_nz (actual_pc));
|
|
|
|
|
read_memory (actual_pc, buf, sizeof (buf));
|
|
|
|
|
displaced_step_dump_bytes (gdb_stdlog, buf, sizeof (buf));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
target_resume (ptid, 1, TARGET_SIGNAL_0);
|
|
|
|
|
|
|
|
|
|
/* Done, we're stepping a thread. */
|
|
|
|
|
break;
|
2008-10-15 07:39:29 +08:00
|
|
|
|
}
|
2008-10-16 03:15:34 +08:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
int step;
|
|
|
|
|
struct thread_info *tp = inferior_thread ();
|
|
|
|
|
|
|
|
|
|
/* The breakpoint we were sitting under has since been
|
|
|
|
|
removed. */
|
|
|
|
|
tp->trap_expected = 0;
|
|
|
|
|
|
|
|
|
|
/* Go back to what we were trying to do. */
|
|
|
|
|
step = currently_stepping (tp);
|
2008-10-15 07:39:29 +08:00
|
|
|
|
|
2008-10-16 03:15:34 +08:00
|
|
|
|
if (debug_displaced)
|
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "breakpoint is gone %s: step(%d)\n",
|
|
|
|
|
target_pid_to_str (tp->ptid), step);
|
|
|
|
|
|
|
|
|
|
target_resume (ptid, step, TARGET_SIGNAL_0);
|
|
|
|
|
tp->stop_signal = TARGET_SIGNAL_0;
|
|
|
|
|
|
|
|
|
|
/* This request was discarded. See if there's any other
|
|
|
|
|
thread waiting for its turn. */
|
|
|
|
|
}
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2008-08-19 06:35:17 +08:00
|
|
|
|
/* Update global variables holding ptids to hold NEW_PTID if they were
|
|
|
|
|
holding OLD_PTID. */
|
|
|
|
|
static void
|
|
|
|
|
infrun_thread_ptid_changed (ptid_t old_ptid, ptid_t new_ptid)
|
|
|
|
|
{
|
|
|
|
|
struct displaced_step_request *it;
|
|
|
|
|
|
|
|
|
|
if (ptid_equal (inferior_ptid, old_ptid))
|
|
|
|
|
inferior_ptid = new_ptid;
|
|
|
|
|
|
|
|
|
|
if (ptid_equal (singlestep_ptid, old_ptid))
|
|
|
|
|
singlestep_ptid = new_ptid;
|
|
|
|
|
|
|
|
|
|
if (ptid_equal (displaced_step_ptid, old_ptid))
|
|
|
|
|
displaced_step_ptid = new_ptid;
|
|
|
|
|
|
|
|
|
|
if (ptid_equal (deferred_step_ptid, old_ptid))
|
|
|
|
|
deferred_step_ptid = new_ptid;
|
|
|
|
|
|
|
|
|
|
for (it = displaced_step_request_queue; it; it = it->next)
|
|
|
|
|
if (ptid_equal (it->ptid, old_ptid))
|
|
|
|
|
it->ptid = new_ptid;
|
|
|
|
|
}
|
|
|
|
|
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
|
|
|
|
|
/* Resuming. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
/* Things to clean up if we QUIT out of resume (). */
|
|
|
|
|
static void
|
2000-05-22 17:02:23 +08:00
|
|
|
|
resume_cleanups (void *ignore)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
normal_stop ();
|
|
|
|
|
}
|
|
|
|
|
|
2000-06-08 08:52:56 +08:00
|
|
|
|
static const char schedlock_off[] = "off";
|
|
|
|
|
static const char schedlock_on[] = "on";
|
|
|
|
|
static const char schedlock_step[] = "step";
|
2002-07-19 01:53:50 +08:00
|
|
|
|
static const char *scheduler_enums[] = {
|
2000-04-20 19:00:34 +08:00
|
|
|
|
schedlock_off,
|
|
|
|
|
schedlock_on,
|
|
|
|
|
schedlock_step,
|
|
|
|
|
NULL
|
|
|
|
|
};
|
2005-02-24 Andrew Cagney <cagney@gnu.org>
Add show_VARIABLE functions, update add_setshow call.
* varobj.c (_initialize_varobj, show_varobjdebug): Add and update.
* valprint.c (_initialize_valprint, show_print_max)
(show_stop_print_at_null, show_repeat_count_threshold)
(show_prettyprint_structs, show_unionprint)
(show_prettyprint_arrays, show_addressprint, show_input_radix)
(show_output_radix): Ditto.
* valops.c (_initialize_valops, show_overload_resolution): Ditto.
* utils.c (initialize_utils, show_chars_per_line)
(show_lines_per_page, show_demangle, show_pagination_enabled)
(show_sevenbit_strings, show_asm_demangle): Ditto
* tui/tui-win.c (_initialize_tui_win, show_tui_border_kind)
(show_tui_border_mode, show_tui_active_border_mode): Ditto.
* top.c (init_main, show_new_async_prompt)
(show_async_command_editing_p, show_write_history_p)
(show_history_size, show_history_filename, show_caution)
(show_annotation_level, init_main): Ditto.
* target.c (initialize_targets, show_targetdebug)
(show_trust_readonly): Ditto.
* symfile.c (_initialize_symfile, show_symbol_reloading)
(show_ext_args, show_download_write_size)
(show_debug_file_directory): Ditto.
* source.c (_initialize_source, show_lines_to_list): Ditto.
* solib.c (_initialize_solib, show_auto_solib_add)
(show_solib_search_path): Ditto.
* p-valprint.c (_initialize_pascal_valprint)
(show_pascal_static_field_print): Ditto.
* printcmd.c (_initialize_printcmd, show_max_symbolic_offset)
(show_print_symbol_filename): Add and update.
* parse.c (_initialize_parse, show_expressiondebug): Dito.
* observer.c (_initialize_observer, show_observer_debug): Dito.
* maint.c (_initialize_maint_cmds, show_watchdog)
(show_maintenance_profile_p): Dito.
* linux-nat.c (_initialize_linux_nat, show_debug_linux_nat): Dito.
* infrun.c (_initialize_infrun, show_debug_infrun)
(show_stop_on_solib_events, show_follow_fork_mode_string)
(show_scheduler_mode, show_step_stop_if_no_debug): Ditto.
* infcall.c (_initialize_infcall, show_coerce_float_to_double_p)
(show_unwind_on_signal_p): Ditto.
* gdbtypes.c (build_gdbtypes, show_opaque_type_resolution)
(_initialize_gdbtypes, show_overload_debug): Ditto.
* gdb-events.c, gdb-events.sh (_initialize_gdb_events)
(show_gdb_events_debug): Ditto.
* gdbarch.c, gdbarch.sh (show_gdbarch_debug)
(_initialize_gdbarch): Ditto.
* frame.c (_initialize_frame, show_backtrace_past_main)
(show_backtrace_past_entry, show_backtrace_limit)
(show_frame_debug): Ditto.
* exec.c (_initialize_exec, show_write_files): Ditto.
* dwarf2read.c (_initialize_dwarf2_read)
(show_dwarf2_max_cache_age): Ditto.
* demangle.c (_initialize_demangler)
(show_demangling_style_names): Ditto.
* dcache.c (_initialize_dcache, show_dcache_enabled_p): Ditto.
* cp-valprint.c (show_static_field_print)
(_initialize_cp_valprint, show_vtblprint, show_objectprint): Ditto.
* corefile.c (_initialize_core, show_gnutarget_string): Ditto.
* cli/cli-logging.c (_initialize_cli_logging)
(show_logging_overwrite, show_logging_redirect)
(show_logging_filename): Ditto.
* cli/cli-cmds.c (show_info_verbose, show_history_expansion_p)
(init_cli_cmds, show_baud_rate, show_remote_debug)
(show_remote_timeout, show_max_user_call_depth): Ditto.
* charset.c (show_host_charset_name, show_target_charset_name)
(initialize_charset): Ditto.
* breakpoint.c (show_can_use_hw_watchpoints)
(show_pending_break_support, _initialize_breakpoint): Ditto.
2005-02-24 21:51:36 +08:00
|
|
|
|
static const char *scheduler_mode = schedlock_off;
|
|
|
|
|
static void
|
|
|
|
|
show_scheduler_mode (struct ui_file *file, int from_tty,
|
|
|
|
|
struct cmd_list_element *c, const char *value)
|
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (file, _("\
|
|
|
|
|
Mode for locking scheduler during execution is \"%s\".\n"),
|
|
|
|
|
value);
|
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
static void
|
1999-08-10 05:36:23 +08:00
|
|
|
|
set_schedlock_func (char *args, int from_tty, struct cmd_list_element *c)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
2005-02-21 15:15:49 +08:00
|
|
|
|
if (!target_can_lock_scheduler)
|
|
|
|
|
{
|
|
|
|
|
scheduler_mode = schedlock_off;
|
|
|
|
|
error (_("Target '%s' cannot support this command."), target_shortname);
|
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
2009-04-14 08:59:47 +08:00
|
|
|
|
/* Try to setup for software single stepping over the specified location.
|
|
|
|
|
Return 1 if target_resume() should use hardware single step.
|
|
|
|
|
|
|
|
|
|
GDBARCH the current gdbarch.
|
|
|
|
|
PC the location to step over. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
maybe_software_singlestep (struct gdbarch *gdbarch, CORE_ADDR pc)
|
|
|
|
|
{
|
|
|
|
|
int hw_step = 1;
|
|
|
|
|
|
|
|
|
|
if (gdbarch_software_single_step_p (gdbarch)
|
|
|
|
|
&& gdbarch_software_single_step (gdbarch, get_current_frame ()))
|
|
|
|
|
{
|
|
|
|
|
hw_step = 0;
|
|
|
|
|
/* Do not pull these breakpoints until after a `wait' in
|
|
|
|
|
`wait_for_inferior' */
|
|
|
|
|
singlestep_breakpoints_inserted_p = 1;
|
|
|
|
|
singlestep_ptid = inferior_ptid;
|
|
|
|
|
singlestep_pc = pc;
|
|
|
|
|
}
|
|
|
|
|
return hw_step;
|
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
/* Resume the inferior, but allow a QUIT. This is useful if the user
|
|
|
|
|
wants to interrupt some lengthy single-stepping operation
|
|
|
|
|
(for child processes, the SIGINT goes to the inferior, and so
|
|
|
|
|
we get a SIGINT random_signal, but for remote debugging and perhaps
|
|
|
|
|
other targets, that's not true).
|
|
|
|
|
|
|
|
|
|
STEP nonzero if we should step (zero to continue instead).
|
|
|
|
|
SIG is the signal to give the inferior (zero for none). */
|
|
|
|
|
void
|
1999-08-10 05:36:23 +08:00
|
|
|
|
resume (int step, enum target_signal sig)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
int should_resume = 1;
|
2000-05-22 17:02:23 +08:00
|
|
|
|
struct cleanup *old_cleanups = make_cleanup (resume_cleanups, 0);
|
2008-05-04 22:12:34 +08:00
|
|
|
|
struct regcache *regcache = get_current_regcache ();
|
|
|
|
|
struct gdbarch *gdbarch = get_regcache_arch (regcache);
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
struct thread_info *tp = inferior_thread ();
|
2008-05-04 22:12:34 +08:00
|
|
|
|
CORE_ADDR pc = regcache_read_pc (regcache);
|
2008-11-21 01:06:05 +08:00
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
QUIT;
|
|
|
|
|
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
|
|
|
"infrun: resume (step=%d, signal=%d), "
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
"trap_expected=%d\n",
|
|
|
|
|
step, sig, tp->trap_expected);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2000-03-29 06:30:19 +08:00
|
|
|
|
/* Some targets (e.g. Solaris x86) have a kernel bug when stepping
|
|
|
|
|
over an instruction that causes a page fault without triggering
|
|
|
|
|
a hardware watchpoint. The kernel properly notices that it shouldn't
|
|
|
|
|
stop, because the hardware watchpoint is not triggered, but it forgets
|
|
|
|
|
the step request and continues the program normally.
|
|
|
|
|
Work around the problem by removing hardware watchpoints if a step is
|
|
|
|
|
requested, GDB will check for a hardware watchpoint trigger after the
|
|
|
|
|
step anyway. */
|
2007-11-29 15:48:21 +08:00
|
|
|
|
if (CANNOT_STEP_HW_WATCHPOINTS && step)
|
2000-03-29 06:30:19 +08:00
|
|
|
|
remove_hw_watchpoints ();
|
2002-07-19 01:53:50 +08:00
|
|
|
|
|
2000-03-29 06:30:19 +08:00
|
|
|
|
|
1999-09-22 11:28:34 +08:00
|
|
|
|
/* Normally, by the time we reach `resume', the breakpoints are either
|
|
|
|
|
removed or inserted, as appropriate. The exception is if we're sitting
|
|
|
|
|
at a permanent breakpoint; we need to step over it, but permanent
|
|
|
|
|
breakpoints can't be removed. So we have to test for it here. */
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
if (breakpoint_here_p (pc) == permanent_breakpoint_here)
|
2007-05-08 02:20:21 +08:00
|
|
|
|
{
|
2008-05-04 22:12:34 +08:00
|
|
|
|
if (gdbarch_skip_permanent_breakpoint_p (gdbarch))
|
|
|
|
|
gdbarch_skip_permanent_breakpoint (gdbarch, regcache);
|
2007-05-08 02:20:21 +08:00
|
|
|
|
else
|
|
|
|
|
error (_("\
|
|
|
|
|
The program is stopped at a permanent breakpoint, but GDB does not know\n\
|
|
|
|
|
how to step past a permanent breakpoint on this architecture. Try using\n\
|
|
|
|
|
a command like `return' or `jump' to continue execution."));
|
|
|
|
|
}
|
1999-09-22 11:28:34 +08:00
|
|
|
|
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
/* If enabled, step over breakpoints by executing a copy of the
|
|
|
|
|
instruction at a different address.
|
|
|
|
|
|
|
|
|
|
We can't use displaced stepping when we have a signal to deliver;
|
|
|
|
|
the comments for displaced_step_prepare explain why. The
|
|
|
|
|
comments in the handle_inferior event for dealing with 'random
|
|
|
|
|
signals' explain what we do instead. */
|
2008-05-04 22:12:34 +08:00
|
|
|
|
if (use_displaced_stepping (gdbarch)
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
&& tp->trap_expected
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
&& sig == TARGET_SIGNAL_0)
|
|
|
|
|
{
|
|
|
|
|
if (!displaced_step_prepare (inferior_ptid))
|
2008-07-12 21:42:54 +08:00
|
|
|
|
{
|
|
|
|
|
/* Got placed in displaced stepping queue. Will be resumed
|
|
|
|
|
later when all the currently queued displaced stepping
|
2008-08-19 21:57:28 +08:00
|
|
|
|
requests finish. The thread is not executing at this point,
|
|
|
|
|
and the call to set_executing will be made later. But we
|
|
|
|
|
need to call set_running here, since from frontend point of view,
|
|
|
|
|
the thread is running. */
|
|
|
|
|
set_running (inferior_ptid, 1);
|
2008-07-12 21:42:54 +08:00
|
|
|
|
discard_cleanups (old_cleanups);
|
|
|
|
|
return;
|
|
|
|
|
}
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
}
|
|
|
|
|
|
2009-04-14 08:59:47 +08:00
|
|
|
|
/* Do we need to do it the hard way, w/temp breakpoints? */
|
|
|
|
|
if (step)
|
|
|
|
|
step = maybe_software_singlestep (gdbarch, pc);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
if (should_resume)
|
|
|
|
|
{
|
2001-05-04 12:15:33 +08:00
|
|
|
|
ptid_t resume_ptid;
|
2000-02-05 15:30:26 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
resume_ptid = RESUME_ALL; /* Default */
|
2001-06-26 08:26:42 +08:00
|
|
|
|
|
2007-11-20 16:18:47 +08:00
|
|
|
|
/* If STEP is set, it's a request to use hardware stepping
|
|
|
|
|
facilities. But in that case, we should never
|
|
|
|
|
use singlestep breakpoint. */
|
|
|
|
|
gdb_assert (!(singlestep_breakpoints_inserted_p && step));
|
|
|
|
|
|
|
|
|
|
if (singlestep_breakpoints_inserted_p
|
|
|
|
|
&& stepping_past_singlestep_breakpoint)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
2007-11-20 16:18:47 +08:00
|
|
|
|
/* The situation here is as follows. In thread T1 we wanted to
|
|
|
|
|
single-step. Lacking hardware single-stepping we've
|
|
|
|
|
set breakpoint at the PC of the next instruction -- call it
|
|
|
|
|
P. After resuming, we've hit that breakpoint in thread T2.
|
|
|
|
|
Now we've removed original breakpoint, inserted breakpoint
|
|
|
|
|
at P+1, and try to step to advance T2 past breakpoint.
|
|
|
|
|
We need to step only T2, as if T1 is allowed to freely run,
|
|
|
|
|
it can run past P, and if other threads are allowed to run,
|
|
|
|
|
they can hit breakpoint at P+1, and nested hits of single-step
|
|
|
|
|
breakpoints is not something we'd want -- that's complicated
|
|
|
|
|
to support, and has no value. */
|
|
|
|
|
resume_ptid = inferior_ptid;
|
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2007-11-28 20:49:55 +08:00
|
|
|
|
if ((step || singlestep_breakpoints_inserted_p)
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
&& tp->trap_expected)
|
2007-11-20 16:18:47 +08:00
|
|
|
|
{
|
2008-04-24 18:21:45 +08:00
|
|
|
|
/* We're allowing a thread to run past a breakpoint it has
|
|
|
|
|
hit, by single-stepping the thread with the breakpoint
|
|
|
|
|
removed. In which case, we need to single-step only this
|
|
|
|
|
thread, and keep others stopped, as they can miss this
|
|
|
|
|
breakpoint if allowed to run.
|
|
|
|
|
|
|
|
|
|
The current code actually removes all breakpoints when
|
|
|
|
|
doing this, not just the one being stepped over, so if we
|
|
|
|
|
let other threads run, we can actually miss any
|
|
|
|
|
breakpoint, not just the one at PC. */
|
2001-06-26 08:26:42 +08:00
|
|
|
|
resume_ptid = inferior_ptid;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
2001-06-26 08:26:42 +08:00
|
|
|
|
|
Non-stop inferior control.
* infrun.c (resume): In non-stop mode, always resume just one
thread.
(proceed): Don't call prepare_to_proceed in non-stop mode.
(fetch_inferior_event): In non-stop mode, switch context before
handling the event.
(error_is_running, ensure_not_running): New.
(handle_inferior_event): In non-stop mode: Mark only the event
thread as stopped. Require that the target module manages adding
threads to the thread list. Assert that there isn't a
deferred_step_ptid set. Don't switch to infwait_thread_hop_state.
(normal_stop): Only mark not-running if inferior hasn't exited.
In non-stop mode, only mark the event thread.
* thread.c:Include "cli/cli-decode.h".
(print_thread_info): Don't read from a running thread.
Output "(running)" if thread is running.
(switch_to_thread): Don't read stop_pc if thread is executing.
(do_restore_current_thread_cleanup): Don't write to a running
thread.
(thread_apply_all_command): Don't read from a running thread. In
non-stop mode, do a full context-switch instead of just switching
threads.
(thread_apply_command): In non-stop mode, do a full context-switch
instead of just switching threads.
(do_captured_thread_select): Likewise. Inform user if selected
thread is running.
(_initialize_thread): Mark "info threads" and "thread" and
async_ok.
* inf-loop.c (inferior_event_handler): In non-stop mode, don't
unregister the target from the event loop.
* infcmd.c (continue_command, step_1, jump_command)
(signal_command): Ensure the selected thread isn't running.
(interrupt_target_command): In non-stop mode, interrupt only the
selected thread.
* inferior.h (error_is_running, ensure_not_running): Declare.
* target.h (struct target_ops): Add ptid argument to the to_stop
member.
(target_stop): Add ptid_t argument.
* target.c (update_current_target): Add ptid argument to to_stop's
type.
(debug_to_stop): Add ptid_t argument.
(debug_to_rcmd): Set to_stop_ptid.
* remote.c (remote_stop): Add ptid_t argument.
(async_remote_interrupt): Add inferior_ptid to target_stop.
* inf-ptrace.c (inf_ptrace_stop): Add ptid argument.
* Makefile.in (thread.o): Depend on $(cli_decode_h).
2008-07-10 06:42:43 +08:00
|
|
|
|
if (non_stop)
|
|
|
|
|
{
|
|
|
|
|
/* With non-stop mode on, threads are always handled
|
|
|
|
|
individually. */
|
|
|
|
|
resume_ptid = inferior_ptid;
|
|
|
|
|
}
|
|
|
|
|
else if ((scheduler_mode == schedlock_on)
|
|
|
|
|
|| (scheduler_mode == schedlock_step
|
|
|
|
|
&& (step || singlestep_breakpoints_inserted_p)))
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
2001-06-26 08:26:42 +08:00
|
|
|
|
/* User-settable 'scheduler' mode requires solo thread resume. */
|
2002-07-19 01:53:50 +08:00
|
|
|
|
resume_ptid = inferior_ptid;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
2001-06-26 08:26:42 +08:00
|
|
|
|
|
2008-05-04 22:12:34 +08:00
|
|
|
|
if (gdbarch_cannot_step_breakpoint (gdbarch))
|
2002-10-03 07:28:54 +08:00
|
|
|
|
{
|
|
|
|
|
/* Most targets can step a breakpoint instruction, thus
|
|
|
|
|
executing it normally. But if this one cannot, just
|
|
|
|
|
continue and we will hit it anyway. */
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
if (step && breakpoint_inserted_here_p (pc))
|
2002-10-03 07:28:54 +08:00
|
|
|
|
step = 0;
|
|
|
|
|
}
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
|
|
|
|
|
if (debug_displaced
|
2008-05-04 22:12:34 +08:00
|
|
|
|
&& use_displaced_stepping (gdbarch)
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
&& tp->trap_expected)
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
{
|
2008-05-04 22:12:34 +08:00
|
|
|
|
struct regcache *resume_regcache = get_thread_regcache (resume_ptid);
|
|
|
|
|
CORE_ADDR actual_pc = regcache_read_pc (resume_regcache);
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
gdb_byte buf[4];
|
|
|
|
|
|
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "displaced: run 0x%s: ",
|
|
|
|
|
paddr_nz (actual_pc));
|
|
|
|
|
read_memory (actual_pc, buf, sizeof (buf));
|
|
|
|
|
displaced_step_dump_bytes (gdb_stdlog, buf, sizeof (buf));
|
|
|
|
|
}
|
|
|
|
|
|
2009-05-25 02:00:08 +08:00
|
|
|
|
/* Install inferior's terminal modes. */
|
|
|
|
|
target_terminal_inferior ();
|
|
|
|
|
|
2008-09-09 05:51:18 +08:00
|
|
|
|
/* Avoid confusing the next resume, if the next stop/resume
|
|
|
|
|
happens to apply to another thread. */
|
|
|
|
|
tp->stop_signal = TARGET_SIGNAL_0;
|
2008-11-20 21:23:26 +08:00
|
|
|
|
|
|
|
|
|
target_resume (resume_ptid, step, sig);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
discard_cleanups (old_cleanups);
|
|
|
|
|
}
|
|
|
|
|
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
/* Proceeding. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
/* Clear out all variables saying what to do when inferior is continued.
|
|
|
|
|
First do this, then set the ones you want, then call `proceed'. */
|
|
|
|
|
|
2008-11-18 02:50:22 +08:00
|
|
|
|
static void
|
|
|
|
|
clear_proceed_status_thread (struct thread_info *tp)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
2008-11-18 02:50:22 +08:00
|
|
|
|
if (debug_infrun)
|
|
|
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
|
|
|
"infrun: clear_proceed_status_thread (%s)\n",
|
|
|
|
|
target_pid_to_str (tp->ptid));
|
2008-09-22 23:20:08 +08:00
|
|
|
|
|
2008-11-18 02:50:22 +08:00
|
|
|
|
tp->trap_expected = 0;
|
|
|
|
|
tp->step_range_start = 0;
|
|
|
|
|
tp->step_range_end = 0;
|
|
|
|
|
tp->step_frame_id = null_frame_id;
|
|
|
|
|
tp->step_over_calls = STEP_OVER_UNDEBUGGABLE;
|
|
|
|
|
tp->stop_requested = 0;
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
|
2008-11-18 02:50:22 +08:00
|
|
|
|
tp->stop_step = 0;
|
2008-09-09 05:48:52 +08:00
|
|
|
|
|
2008-11-18 02:50:22 +08:00
|
|
|
|
tp->proceed_to_finish = 0;
|
2008-09-09 05:55:16 +08:00
|
|
|
|
|
2008-11-18 02:50:22 +08:00
|
|
|
|
/* Discard any remaining commands or status from previous stop. */
|
|
|
|
|
bpstat_clear (&tp->stop_bpstat);
|
|
|
|
|
}
|
2008-09-09 05:48:52 +08:00
|
|
|
|
|
2008-11-18 02:50:22 +08:00
|
|
|
|
static int
|
|
|
|
|
clear_proceed_status_callback (struct thread_info *tp, void *data)
|
|
|
|
|
{
|
|
|
|
|
if (is_exited (tp->ptid))
|
|
|
|
|
return 0;
|
2008-09-22 23:20:08 +08:00
|
|
|
|
|
2008-11-18 02:50:22 +08:00
|
|
|
|
clear_proceed_status_thread (tp);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
clear_proceed_status (void)
|
|
|
|
|
{
|
|
|
|
|
if (!ptid_equal (inferior_ptid, null_ptid))
|
|
|
|
|
{
|
|
|
|
|
struct inferior *inferior;
|
|
|
|
|
|
|
|
|
|
if (non_stop)
|
|
|
|
|
{
|
|
|
|
|
/* If in non-stop mode, only delete the per-thread status
|
|
|
|
|
of the current thread. */
|
|
|
|
|
clear_proceed_status_thread (inferior_thread ());
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* In all-stop mode, delete the per-thread status of
|
|
|
|
|
*all* threads. */
|
|
|
|
|
iterate_over_threads (clear_proceed_status_callback, NULL);
|
|
|
|
|
}
|
|
|
|
|
|
2008-09-22 23:20:08 +08:00
|
|
|
|
inferior = current_inferior ();
|
|
|
|
|
inferior->stop_soon = NO_STOP_QUIETLY;
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
stop_after_trap = 0;
|
2009-03-23 02:06:07 +08:00
|
|
|
|
|
|
|
|
|
observer_notify_about_to_proceed ();
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2007-06-22 20:38:04 +08:00
|
|
|
|
if (stop_registers)
|
|
|
|
|
{
|
|
|
|
|
regcache_xfree (stop_registers);
|
|
|
|
|
stop_registers = NULL;
|
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
2009-05-30 08:19:13 +08:00
|
|
|
|
/* Check the current thread against the thread that reported the most recent
|
|
|
|
|
event. If a step-over is required return TRUE and set the current thread
|
|
|
|
|
to the old thread. Otherwise return FALSE.
|
|
|
|
|
|
|
|
|
|
This should be suitable for any targets that support threads. */
|
2003-06-19 23:04:58 +08:00
|
|
|
|
|
|
|
|
|
static int
|
2007-09-11 02:49:26 +08:00
|
|
|
|
prepare_to_proceed (int step)
|
2003-06-19 23:04:58 +08:00
|
|
|
|
{
|
|
|
|
|
ptid_t wait_ptid;
|
|
|
|
|
struct target_waitstatus wait_status;
|
2009-05-30 08:19:13 +08:00
|
|
|
|
int schedlock_enabled;
|
|
|
|
|
|
|
|
|
|
/* With non-stop mode on, threads are always handled individually. */
|
|
|
|
|
gdb_assert (! non_stop);
|
2003-06-19 23:04:58 +08:00
|
|
|
|
|
|
|
|
|
/* Get the last target status returned by target_wait(). */
|
|
|
|
|
get_last_target_status (&wait_ptid, &wait_status);
|
|
|
|
|
|
2007-09-11 02:49:26 +08:00
|
|
|
|
/* Make sure we were stopped at a breakpoint. */
|
2003-06-19 23:04:58 +08:00
|
|
|
|
if (wait_status.kind != TARGET_WAITKIND_STOPPED
|
2007-09-11 02:49:26 +08:00
|
|
|
|
|| wait_status.value.sig != TARGET_SIGNAL_TRAP)
|
2003-06-19 23:04:58 +08:00
|
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2009-05-30 08:19:13 +08:00
|
|
|
|
schedlock_enabled = (scheduler_mode == schedlock_on
|
|
|
|
|
|| (scheduler_mode == schedlock_step
|
|
|
|
|
&& step));
|
|
|
|
|
|
2007-09-11 02:49:26 +08:00
|
|
|
|
/* Switched over from WAIT_PID. */
|
2003-06-19 23:04:58 +08:00
|
|
|
|
if (!ptid_equal (wait_ptid, minus_one_ptid)
|
2009-05-30 08:19:13 +08:00
|
|
|
|
&& !ptid_equal (inferior_ptid, wait_ptid)
|
|
|
|
|
/* Don't single step WAIT_PID if scheduler locking is on. */
|
|
|
|
|
&& !schedlock_enabled)
|
2003-06-19 23:04:58 +08:00
|
|
|
|
{
|
2008-05-04 22:12:34 +08:00
|
|
|
|
struct regcache *regcache = get_thread_regcache (wait_ptid);
|
|
|
|
|
|
|
|
|
|
if (breakpoint_here_p (regcache_read_pc (regcache)))
|
2003-06-19 23:04:58 +08:00
|
|
|
|
{
|
2008-05-04 22:12:34 +08:00
|
|
|
|
/* If stepping, remember current thread to switch back to. */
|
|
|
|
|
if (step)
|
|
|
|
|
deferred_step_ptid = inferior_ptid;
|
2003-06-19 23:04:58 +08:00
|
|
|
|
|
2008-05-04 22:12:34 +08:00
|
|
|
|
/* Switch back to WAIT_PID thread. */
|
|
|
|
|
switch_to_thread (wait_ptid);
|
2007-09-11 02:49:26 +08:00
|
|
|
|
|
2008-05-04 22:12:34 +08:00
|
|
|
|
/* We return 1 to indicate that there is a breakpoint here,
|
|
|
|
|
so we need to step over it before continuing to avoid
|
|
|
|
|
hitting it straight away. */
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
2003-06-19 23:04:58 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2003-05-08 02:35:57 +08:00
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
/* Basic routine for continuing the program in various fashions.
|
|
|
|
|
|
|
|
|
|
ADDR is the address to resume at, or -1 for resume where stopped.
|
|
|
|
|
SIGGNAL is the signal to give it, or 0 for none,
|
1999-07-08 04:19:36 +08:00
|
|
|
|
or -1 for act according to how it stopped.
|
1999-04-16 09:35:26 +08:00
|
|
|
|
STEP is nonzero if should trap after one instruction.
|
1999-07-08 04:19:36 +08:00
|
|
|
|
-1 means return after that and print nothing.
|
|
|
|
|
You should probably set various step_... variables
|
|
|
|
|
before calling here, if you are stepping.
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
You should call clear_proceed_status before calling proceed. */
|
|
|
|
|
|
|
|
|
|
void
|
1999-08-10 05:36:23 +08:00
|
|
|
|
proceed (CORE_ADDR addr, enum target_signal siggnal, int step)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
2009-05-25 02:00:08 +08:00
|
|
|
|
struct regcache *regcache;
|
|
|
|
|
struct gdbarch *gdbarch;
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
struct thread_info *tp;
|
2009-05-25 02:00:08 +08:00
|
|
|
|
CORE_ADDR pc;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
int oneproc = 0;
|
|
|
|
|
|
2009-05-25 02:00:08 +08:00
|
|
|
|
/* If we're stopped at a fork/vfork, follow the branch set by the
|
|
|
|
|
"set follow-fork-mode" command; otherwise, we'll just proceed
|
|
|
|
|
resuming the current thread. */
|
|
|
|
|
if (!follow_fork ())
|
|
|
|
|
{
|
|
|
|
|
/* The target for some reason decided not to resume. */
|
|
|
|
|
normal_stop ();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
regcache = get_current_regcache ();
|
|
|
|
|
gdbarch = get_regcache_arch (regcache);
|
|
|
|
|
pc = regcache_read_pc (regcache);
|
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
if (step > 0)
|
2008-05-04 22:12:34 +08:00
|
|
|
|
step_start_function = find_pc_function (pc);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
if (step < 0)
|
|
|
|
|
stop_after_trap = 1;
|
|
|
|
|
|
1999-10-06 07:13:56 +08:00
|
|
|
|
if (addr == (CORE_ADDR) -1)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
2008-10-18 03:43:47 +08:00
|
|
|
|
if (pc == stop_pc && breakpoint_here_p (pc)
|
|
|
|
|
&& execution_direction != EXEC_REVERSE)
|
2004-11-01 01:38:16 +08:00
|
|
|
|
/* There is a breakpoint at the address we will resume at,
|
|
|
|
|
step one instruction before inserting breakpoints so that
|
|
|
|
|
we do not stop right away (and report a second hit at this
|
2008-10-18 03:43:47 +08:00
|
|
|
|
breakpoint).
|
|
|
|
|
|
|
|
|
|
Note, we don't do this in reverse, because we won't
|
|
|
|
|
actually be executing the breakpoint insn anyway.
|
|
|
|
|
We'll be (un-)executing the previous instruction. */
|
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
oneproc = 1;
|
2008-05-04 22:12:34 +08:00
|
|
|
|
else if (gdbarch_single_step_through_delay_p (gdbarch)
|
|
|
|
|
&& gdbarch_single_step_through_delay (gdbarch,
|
|
|
|
|
get_current_frame ()))
|
2004-11-01 01:38:16 +08:00
|
|
|
|
/* We stepped onto an instruction that needs to be stepped
|
|
|
|
|
again before re-inserting the breakpoint, do so. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
oneproc = 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2008-05-04 22:12:34 +08:00
|
|
|
|
regcache_write_pc (regcache, addr);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2005-01-20 00:09:46 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
|
|
|
"infrun: proceed (addr=0x%s, signal=%d, step=%d)\n",
|
|
|
|
|
paddr_nz (addr), siggnal, step);
|
2004-11-09 01:25:23 +08:00
|
|
|
|
|
Non-stop inferior control.
* infrun.c (resume): In non-stop mode, always resume just one
thread.
(proceed): Don't call prepare_to_proceed in non-stop mode.
(fetch_inferior_event): In non-stop mode, switch context before
handling the event.
(error_is_running, ensure_not_running): New.
(handle_inferior_event): In non-stop mode: Mark only the event
thread as stopped. Require that the target module manages adding
threads to the thread list. Assert that there isn't a
deferred_step_ptid set. Don't switch to infwait_thread_hop_state.
(normal_stop): Only mark not-running if inferior hasn't exited.
In non-stop mode, only mark the event thread.
* thread.c:Include "cli/cli-decode.h".
(print_thread_info): Don't read from a running thread.
Output "(running)" if thread is running.
(switch_to_thread): Don't read stop_pc if thread is executing.
(do_restore_current_thread_cleanup): Don't write to a running
thread.
(thread_apply_all_command): Don't read from a running thread. In
non-stop mode, do a full context-switch instead of just switching
threads.
(thread_apply_command): In non-stop mode, do a full context-switch
instead of just switching threads.
(do_captured_thread_select): Likewise. Inform user if selected
thread is running.
(_initialize_thread): Mark "info threads" and "thread" and
async_ok.
* inf-loop.c (inferior_event_handler): In non-stop mode, don't
unregister the target from the event loop.
* infcmd.c (continue_command, step_1, jump_command)
(signal_command): Ensure the selected thread isn't running.
(interrupt_target_command): In non-stop mode, interrupt only the
selected thread.
* inferior.h (error_is_running, ensure_not_running): Declare.
* target.h (struct target_ops): Add ptid argument to the to_stop
member.
(target_stop): Add ptid_t argument.
* target.c (update_current_target): Add ptid argument to to_stop's
type.
(debug_to_stop): Add ptid_t argument.
(debug_to_rcmd): Set to_stop_ptid.
* remote.c (remote_stop): Add ptid_t argument.
(async_remote_interrupt): Add inferior_ptid to target_stop.
* inf-ptrace.c (inf_ptrace_stop): Add ptid argument.
* Makefile.in (thread.o): Depend on $(cli_decode_h).
2008-07-10 06:42:43 +08:00
|
|
|
|
if (non_stop)
|
|
|
|
|
/* In non-stop, each thread is handled individually. The context
|
|
|
|
|
must already be set to the right thread here. */
|
|
|
|
|
;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* In a multi-threaded task we may select another thread and
|
|
|
|
|
then continue or step.
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
Non-stop inferior control.
* infrun.c (resume): In non-stop mode, always resume just one
thread.
(proceed): Don't call prepare_to_proceed in non-stop mode.
(fetch_inferior_event): In non-stop mode, switch context before
handling the event.
(error_is_running, ensure_not_running): New.
(handle_inferior_event): In non-stop mode: Mark only the event
thread as stopped. Require that the target module manages adding
threads to the thread list. Assert that there isn't a
deferred_step_ptid set. Don't switch to infwait_thread_hop_state.
(normal_stop): Only mark not-running if inferior hasn't exited.
In non-stop mode, only mark the event thread.
* thread.c:Include "cli/cli-decode.h".
(print_thread_info): Don't read from a running thread.
Output "(running)" if thread is running.
(switch_to_thread): Don't read stop_pc if thread is executing.
(do_restore_current_thread_cleanup): Don't write to a running
thread.
(thread_apply_all_command): Don't read from a running thread. In
non-stop mode, do a full context-switch instead of just switching
threads.
(thread_apply_command): In non-stop mode, do a full context-switch
instead of just switching threads.
(do_captured_thread_select): Likewise. Inform user if selected
thread is running.
(_initialize_thread): Mark "info threads" and "thread" and
async_ok.
* inf-loop.c (inferior_event_handler): In non-stop mode, don't
unregister the target from the event loop.
* infcmd.c (continue_command, step_1, jump_command)
(signal_command): Ensure the selected thread isn't running.
(interrupt_target_command): In non-stop mode, interrupt only the
selected thread.
* inferior.h (error_is_running, ensure_not_running): Declare.
* target.h (struct target_ops): Add ptid argument to the to_stop
member.
(target_stop): Add ptid_t argument.
* target.c (update_current_target): Add ptid argument to to_stop's
type.
(debug_to_stop): Add ptid_t argument.
(debug_to_rcmd): Set to_stop_ptid.
* remote.c (remote_stop): Add ptid_t argument.
(async_remote_interrupt): Add inferior_ptid to target_stop.
* inf-ptrace.c (inf_ptrace_stop): Add ptid argument.
* Makefile.in (thread.o): Depend on $(cli_decode_h).
2008-07-10 06:42:43 +08:00
|
|
|
|
But if the old thread was stopped at a breakpoint, it will
|
|
|
|
|
immediately cause another breakpoint stop without any
|
|
|
|
|
execution (i.e. it will report a breakpoint hit incorrectly).
|
|
|
|
|
So we must step over it first.
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
Non-stop inferior control.
* infrun.c (resume): In non-stop mode, always resume just one
thread.
(proceed): Don't call prepare_to_proceed in non-stop mode.
(fetch_inferior_event): In non-stop mode, switch context before
handling the event.
(error_is_running, ensure_not_running): New.
(handle_inferior_event): In non-stop mode: Mark only the event
thread as stopped. Require that the target module manages adding
threads to the thread list. Assert that there isn't a
deferred_step_ptid set. Don't switch to infwait_thread_hop_state.
(normal_stop): Only mark not-running if inferior hasn't exited.
In non-stop mode, only mark the event thread.
* thread.c:Include "cli/cli-decode.h".
(print_thread_info): Don't read from a running thread.
Output "(running)" if thread is running.
(switch_to_thread): Don't read stop_pc if thread is executing.
(do_restore_current_thread_cleanup): Don't write to a running
thread.
(thread_apply_all_command): Don't read from a running thread. In
non-stop mode, do a full context-switch instead of just switching
threads.
(thread_apply_command): In non-stop mode, do a full context-switch
instead of just switching threads.
(do_captured_thread_select): Likewise. Inform user if selected
thread is running.
(_initialize_thread): Mark "info threads" and "thread" and
async_ok.
* inf-loop.c (inferior_event_handler): In non-stop mode, don't
unregister the target from the event loop.
* infcmd.c (continue_command, step_1, jump_command)
(signal_command): Ensure the selected thread isn't running.
(interrupt_target_command): In non-stop mode, interrupt only the
selected thread.
* inferior.h (error_is_running, ensure_not_running): Declare.
* target.h (struct target_ops): Add ptid argument to the to_stop
member.
(target_stop): Add ptid_t argument.
* target.c (update_current_target): Add ptid argument to to_stop's
type.
(debug_to_stop): Add ptid_t argument.
(debug_to_rcmd): Set to_stop_ptid.
* remote.c (remote_stop): Add ptid_t argument.
(async_remote_interrupt): Add inferior_ptid to target_stop.
* inf-ptrace.c (inf_ptrace_stop): Add ptid argument.
* Makefile.in (thread.o): Depend on $(cli_decode_h).
2008-07-10 06:42:43 +08:00
|
|
|
|
prepare_to_proceed checks the current thread against the
|
|
|
|
|
thread that reported the most recent event. If a step-over
|
|
|
|
|
is required it returns TRUE and sets the current thread to
|
|
|
|
|
the old thread. */
|
|
|
|
|
if (prepare_to_proceed (step))
|
|
|
|
|
oneproc = 1;
|
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
/* prepare_to_proceed may change the current thread. */
|
|
|
|
|
tp = inferior_thread ();
|
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
if (oneproc)
|
2008-04-24 18:21:45 +08:00
|
|
|
|
{
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
tp->trap_expected = 1;
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
/* If displaced stepping is enabled, we can step over the
|
|
|
|
|
breakpoint without hitting it, so leave all breakpoints
|
|
|
|
|
inserted. Otherwise we need to disable all breakpoints, step
|
|
|
|
|
one instruction, and then re-add them when that step is
|
|
|
|
|
finished. */
|
2008-05-04 22:12:34 +08:00
|
|
|
|
if (!use_displaced_stepping (gdbarch))
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
remove_breakpoints ();
|
2008-04-24 18:21:45 +08:00
|
|
|
|
}
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
|
|
|
|
|
/* We can insert breakpoints if we're not trying to step over one,
|
|
|
|
|
or if we are stepping over one but we're using displaced stepping
|
|
|
|
|
to do so. */
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
if (! tp->trap_expected || use_displaced_stepping (gdbarch))
|
2007-11-29 15:48:21 +08:00
|
|
|
|
insert_breakpoints ();
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2008-09-09 05:51:18 +08:00
|
|
|
|
if (!non_stop)
|
|
|
|
|
{
|
|
|
|
|
/* Pass the last stop signal to the thread we're resuming,
|
|
|
|
|
irrespective of whether the current thread is the thread that
|
|
|
|
|
got the last event or not. This was historically GDB's
|
|
|
|
|
behaviour before keeping a stop_signal per thread. */
|
|
|
|
|
|
|
|
|
|
struct thread_info *last_thread;
|
|
|
|
|
ptid_t last_ptid;
|
|
|
|
|
struct target_waitstatus last_status;
|
|
|
|
|
|
|
|
|
|
get_last_target_status (&last_ptid, &last_status);
|
|
|
|
|
if (!ptid_equal (inferior_ptid, last_ptid)
|
|
|
|
|
&& !ptid_equal (last_ptid, null_ptid)
|
|
|
|
|
&& !ptid_equal (last_ptid, minus_one_ptid))
|
|
|
|
|
{
|
2009-05-25 05:06:53 +08:00
|
|
|
|
last_thread = find_thread_ptid (last_ptid);
|
2008-09-09 05:51:18 +08:00
|
|
|
|
if (last_thread)
|
|
|
|
|
{
|
|
|
|
|
tp->stop_signal = last_thread->stop_signal;
|
|
|
|
|
last_thread->stop_signal = TARGET_SIGNAL_0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
if (siggnal != TARGET_SIGNAL_DEFAULT)
|
2008-09-09 05:51:18 +08:00
|
|
|
|
tp->stop_signal = siggnal;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
/* If this signal should not be seen by program,
|
|
|
|
|
give it zero. Used for debugging signals. */
|
2008-09-09 05:51:18 +08:00
|
|
|
|
else if (!signal_program[tp->stop_signal])
|
|
|
|
|
tp->stop_signal = TARGET_SIGNAL_0;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
annotate_starting ();
|
|
|
|
|
|
|
|
|
|
/* Make sure that output from GDB appears before output from the
|
|
|
|
|
inferior. */
|
|
|
|
|
gdb_flush (gdb_stdout);
|
|
|
|
|
|
2003-05-08 02:35:57 +08:00
|
|
|
|
/* Refresh prev_pc value just prior to resuming. This used to be
|
|
|
|
|
done in stop_stepping, however, setting prev_pc there did not handle
|
|
|
|
|
scenarios such as inferior function calls or returning from
|
|
|
|
|
a function via the return command. In those cases, the prev_pc
|
|
|
|
|
value was not set properly for subsequent commands. The prev_pc value
|
|
|
|
|
is used to initialize the starting line number in the ecs. With an
|
|
|
|
|
invalid value, the gdb next command ends up stopping at the position
|
|
|
|
|
represented by the next line table entry past our start position.
|
|
|
|
|
On platforms that generate one line table entry per line, this
|
|
|
|
|
is not a problem. However, on the ia64, the compiler generates
|
|
|
|
|
extraneous line table entries that do not increase the line number.
|
|
|
|
|
When we issue the gdb next command on the ia64 after an inferior call
|
|
|
|
|
or a return command, we often end up a few instructions forward, still
|
|
|
|
|
within the original line we started.
|
|
|
|
|
|
|
|
|
|
An attempt was made to have init_execution_control_state () refresh
|
|
|
|
|
the prev_pc value before calculating the line number. This approach
|
|
|
|
|
did not work because on platforms that use ptrace, the pc register
|
|
|
|
|
cannot be read unless the inferior is stopped. At that point, we
|
2008-05-04 22:12:34 +08:00
|
|
|
|
are not guaranteed the inferior is stopped and so the regcache_read_pc ()
|
2003-05-08 02:35:57 +08:00
|
|
|
|
call can fail. Setting the prev_pc value here ensures the value is
|
2004-08-25 22:47:07 +08:00
|
|
|
|
updated correctly when the inferior is stopped. */
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
tp->prev_pc = regcache_read_pc (get_current_regcache ());
|
2003-05-08 02:35:57 +08:00
|
|
|
|
|
2008-07-10 06:36:51 +08:00
|
|
|
|
/* Fill in with reasonable starting values. */
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
init_thread_stepping_state (tp);
|
2008-07-10 06:36:51 +08:00
|
|
|
|
|
|
|
|
|
/* Reset to normal state. */
|
|
|
|
|
init_infwait_state ();
|
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
/* Resume inferior. */
|
2008-09-09 05:51:18 +08:00
|
|
|
|
resume (oneproc || step || bpstat_should_step (), tp->stop_signal);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
/* Wait for it to stop (if not standalone)
|
|
|
|
|
and in any case decode why it stopped, and act accordingly. */
|
1999-07-06 01:58:44 +08:00
|
|
|
|
/* Do this only if we are not using the event loop, or if the target
|
|
|
|
|
does not support asynchronous execution. */
|
2004-09-13 Andrew Cagney <cagney@gnu.org>
Eliminate event_loop_p, always has the value 1.
* defs.h (event_loop_p): Delete macro.
* breakpoint.c (until_break_command): Simplify.
* utils.c (prompt_for_continue): Simplify.
* tracepoint.c (read_actions): Simplify.
* top.c (throw_exception, execute_command, gdb_readline_wrapper)
(gdb_rl_operate_and_get_next, command_line_input, get_prompt)
(set_prompt, init_main): Simplify.
(init_signals, disconnect): Delete, unused.
* remote.c (remote_async_resume)
(extended_remote_async_create_inferior): Simplify.
* mi/mi-interp.c (mi_input): Delete, unused.
(mi_interpreter_resume, mi_command_loop): Simplify.
* interps.c (current_interp_command_loop): Simplify.
* infrun.c (proceed): Simplify.
* infcmd.c (run_command, continue_command, step_1, jump_command)
(until_command, advance_command, finish_command)
(interrupt_target_command): Simplify.
* event-top.c (gdb_setup_readline, gdb_disable_readline): Simplify.
2004-09-14 02:26:31 +08:00
|
|
|
|
if (!target_can_async_p ())
|
1999-07-06 01:58:44 +08:00
|
|
|
|
{
|
2008-01-30 05:11:24 +08:00
|
|
|
|
wait_for_inferior (0);
|
1999-07-06 01:58:44 +08:00
|
|
|
|
normal_stop ();
|
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Start remote-debugging of a machine over a serial link. */
|
1999-08-10 05:36:23 +08:00
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
void
|
2006-10-19 00:56:13 +08:00
|
|
|
|
start_remote (int from_tty)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
2008-09-22 23:20:08 +08:00
|
|
|
|
struct inferior *inferior;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
init_wait_for_inferior ();
|
2008-09-22 23:20:08 +08:00
|
|
|
|
|
|
|
|
|
inferior = current_inferior ();
|
|
|
|
|
inferior->stop_soon = STOP_QUIETLY_REMOTE;
|
1999-07-06 01:58:44 +08:00
|
|
|
|
|
1999-09-29 05:55:21 +08:00
|
|
|
|
/* Always go on waiting for the target, regardless of the mode. */
|
|
|
|
|
/* FIXME: cagney/1999-09-23: At present it isn't possible to
|
2000-10-27 23:02:42 +08:00
|
|
|
|
indicate to wait_for_inferior that a target should timeout if
|
1999-09-29 05:55:21 +08:00
|
|
|
|
nothing is returned (instead of just blocking). Because of this,
|
|
|
|
|
targets expecting an immediate response need to, internally, set
|
|
|
|
|
things up so that the target_wait() is forced to eventually
|
|
|
|
|
timeout. */
|
|
|
|
|
/* FIXME: cagney/1999-09-24: It isn't possible for target_open() to
|
|
|
|
|
differentiate to its caller what the state of the target is after
|
|
|
|
|
the initial open has been performed. Here we're assuming that
|
|
|
|
|
the target has stopped. It should be possible to eventually have
|
|
|
|
|
target_open() return to the caller an indication that the target
|
|
|
|
|
is currently running and GDB state should be set to the same as
|
|
|
|
|
for an async run. */
|
2008-01-30 05:11:24 +08:00
|
|
|
|
wait_for_inferior (0);
|
2006-10-19 00:56:13 +08:00
|
|
|
|
|
|
|
|
|
/* Now that the inferior has stopped, do any bookkeeping like
|
|
|
|
|
loading shared libraries. We want to do this before normal_stop,
|
|
|
|
|
so that the displayed frame is up to date. */
|
|
|
|
|
post_create_inferior (¤t_target, from_tty);
|
|
|
|
|
|
1999-09-29 05:55:21 +08:00
|
|
|
|
normal_stop ();
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Initialize static vars when a new inferior begins. */
|
|
|
|
|
|
|
|
|
|
void
|
1999-08-10 05:36:23 +08:00
|
|
|
|
init_wait_for_inferior (void)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
/* These are meaningless until the first time through wait_for_inferior. */
|
|
|
|
|
|
|
|
|
|
breakpoint_init_inferior (inf_starting);
|
|
|
|
|
|
|
|
|
|
clear_proceed_status ();
|
2004-02-17 04:49:51 +08:00
|
|
|
|
|
|
|
|
|
stepping_past_singlestep_breakpoint = 0;
|
2007-12-06 20:57:51 +08:00
|
|
|
|
deferred_step_ptid = null_ptid;
|
2007-12-07 08:44:27 +08:00
|
|
|
|
|
|
|
|
|
target_last_wait_ptid = minus_one_ptid;
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
|
Refactor infrun a bit.
* infrun.c (currently_stepping): Take a struct
thread_stepping_state instead of an execution_control_state.
(struct thread_stepping_state): New, split from
execution_control_state.
(gtss, tss): New globals.
(proceed): Clear the stepping state, set previous_inferior_ptid
and clear infwait state.
(init_wait_for_inferior): Clear the stepping state,
previous_inferior_ptid and infwait state.
(waiton_ptid, infwait_state): New, split from
execution_control_state.
(struct execution_control_state): Members that persist through
events moved out to either struct thred_stepping_state or made
global. Deleted unneeded wp, saved_inferior_ptid, tmpstatus.
(wait_for_inferior, fetch_inferior_event): Use local
execution_control_state. Update to execution_control_state split.
(init_execution_control_state): Adjust.
(init_thread_stepping_state): New, extracted from
init_execution_control_state.
(context_switch): Take a ptid instead of an
execution_control_state.
(context_switch_to): Adjust.
(adjust_pc_after_break): Adjust.
(init_infwait_state): New.
(handle_inferior_event): Adjust.
2008-07-10 06:33:16 +08:00
|
|
|
|
previous_inferior_ptid = null_ptid;
|
|
|
|
|
init_infwait_state ();
|
|
|
|
|
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
displaced_step_clear ();
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
1999-05-05 22:45:51 +08:00
|
|
|
|
/* This enum encodes possible reasons for doing a target_wait, so that
|
|
|
|
|
wfi can call target_wait in one place. (Ultimately the call will be
|
|
|
|
|
moved out of the infinite loop entirely.) */
|
|
|
|
|
|
1999-07-08 04:19:36 +08:00
|
|
|
|
enum infwait_states
|
|
|
|
|
{
|
1999-05-11 21:35:55 +08:00
|
|
|
|
infwait_normal_state,
|
|
|
|
|
infwait_thread_hop_state,
|
2007-10-01 08:17:58 +08:00
|
|
|
|
infwait_step_watch_state,
|
1999-05-11 21:35:55 +08:00
|
|
|
|
infwait_nonstep_watch_state
|
1999-05-05 22:45:51 +08:00
|
|
|
|
};
|
|
|
|
|
|
1999-11-09 09:23:30 +08:00
|
|
|
|
/* Why did the inferior stop? Used to print the appropriate messages
|
|
|
|
|
to the interface from within handle_inferior_event(). */
|
|
|
|
|
enum inferior_stop_reason
|
|
|
|
|
{
|
|
|
|
|
/* Step, next, nexti, stepi finished. */
|
|
|
|
|
END_STEPPING_RANGE,
|
|
|
|
|
/* Inferior terminated by signal. */
|
|
|
|
|
SIGNAL_EXITED,
|
|
|
|
|
/* Inferior exited. */
|
|
|
|
|
EXITED,
|
|
|
|
|
/* Inferior received signal, and user asked to be notified. */
|
2008-10-18 03:43:47 +08:00
|
|
|
|
SIGNAL_RECEIVED,
|
|
|
|
|
/* Reverse execution -- target ran out of history info. */
|
|
|
|
|
NO_HISTORY
|
1999-11-09 09:23:30 +08:00
|
|
|
|
};
|
|
|
|
|
|
Refactor infrun a bit.
* infrun.c (currently_stepping): Take a struct
thread_stepping_state instead of an execution_control_state.
(struct thread_stepping_state): New, split from
execution_control_state.
(gtss, tss): New globals.
(proceed): Clear the stepping state, set previous_inferior_ptid
and clear infwait state.
(init_wait_for_inferior): Clear the stepping state,
previous_inferior_ptid and infwait state.
(waiton_ptid, infwait_state): New, split from
execution_control_state.
(struct execution_control_state): Members that persist through
events moved out to either struct thred_stepping_state or made
global. Deleted unneeded wp, saved_inferior_ptid, tmpstatus.
(wait_for_inferior, fetch_inferior_event): Use local
execution_control_state. Update to execution_control_state split.
(init_execution_control_state): Adjust.
(init_thread_stepping_state): New, extracted from
init_execution_control_state.
(context_switch): Take a ptid instead of an
execution_control_state.
(context_switch_to): Adjust.
(adjust_pc_after_break): Adjust.
(init_infwait_state): New.
(handle_inferior_event): Adjust.
2008-07-10 06:33:16 +08:00
|
|
|
|
/* The PTID we'll do a target_wait on.*/
|
|
|
|
|
ptid_t waiton_ptid;
|
|
|
|
|
|
|
|
|
|
/* Current inferior wait state. */
|
|
|
|
|
enum infwait_states infwait_state;
|
1999-05-11 21:35:55 +08:00
|
|
|
|
|
Refactor infrun a bit.
* infrun.c (currently_stepping): Take a struct
thread_stepping_state instead of an execution_control_state.
(struct thread_stepping_state): New, split from
execution_control_state.
(gtss, tss): New globals.
(proceed): Clear the stepping state, set previous_inferior_ptid
and clear infwait state.
(init_wait_for_inferior): Clear the stepping state,
previous_inferior_ptid and infwait state.
(waiton_ptid, infwait_state): New, split from
execution_control_state.
(struct execution_control_state): Members that persist through
events moved out to either struct thred_stepping_state or made
global. Deleted unneeded wp, saved_inferior_ptid, tmpstatus.
(wait_for_inferior, fetch_inferior_event): Use local
execution_control_state. Update to execution_control_state split.
(init_execution_control_state): Adjust.
(init_thread_stepping_state): New, extracted from
init_execution_control_state.
(context_switch): Take a ptid instead of an
execution_control_state.
(context_switch_to): Adjust.
(adjust_pc_after_break): Adjust.
(init_infwait_state): New.
(handle_inferior_event): Adjust.
2008-07-10 06:33:16 +08:00
|
|
|
|
/* Data to be passed around while handling an event. This data is
|
|
|
|
|
discarded between events. */
|
1999-07-08 04:19:36 +08:00
|
|
|
|
struct execution_control_state
|
2002-07-19 01:53:50 +08:00
|
|
|
|
{
|
Refactor infrun a bit.
* infrun.c (currently_stepping): Take a struct
thread_stepping_state instead of an execution_control_state.
(struct thread_stepping_state): New, split from
execution_control_state.
(gtss, tss): New globals.
(proceed): Clear the stepping state, set previous_inferior_ptid
and clear infwait state.
(init_wait_for_inferior): Clear the stepping state,
previous_inferior_ptid and infwait state.
(waiton_ptid, infwait_state): New, split from
execution_control_state.
(struct execution_control_state): Members that persist through
events moved out to either struct thred_stepping_state or made
global. Deleted unneeded wp, saved_inferior_ptid, tmpstatus.
(wait_for_inferior, fetch_inferior_event): Use local
execution_control_state. Update to execution_control_state split.
(init_execution_control_state): Adjust.
(init_thread_stepping_state): New, extracted from
init_execution_control_state.
(context_switch): Take a ptid instead of an
execution_control_state.
(context_switch_to): Adjust.
(adjust_pc_after_break): Adjust.
(init_infwait_state): New.
(handle_inferior_event): Adjust.
2008-07-10 06:33:16 +08:00
|
|
|
|
ptid_t ptid;
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
/* The thread that got the event, if this was a thread event; NULL
|
|
|
|
|
otherwise. */
|
|
|
|
|
struct thread_info *event_thread;
|
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
struct target_waitstatus ws;
|
|
|
|
|
int random_signal;
|
|
|
|
|
CORE_ADDR stop_func_start;
|
|
|
|
|
CORE_ADDR stop_func_end;
|
|
|
|
|
char *stop_func_name;
|
|
|
|
|
int new_thread_event;
|
|
|
|
|
int wait_some_more;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
void init_execution_control_state (struct execution_control_state *ecs);
|
|
|
|
|
|
|
|
|
|
void handle_inferior_event (struct execution_control_state *ecs);
|
1999-05-11 21:35:55 +08:00
|
|
|
|
|
2008-10-18 03:43:47 +08:00
|
|
|
|
static void handle_step_into_function (struct execution_control_state *ecs);
|
|
|
|
|
static void handle_step_into_function_backward (struct execution_control_state *ecs);
|
2004-09-28 01:58:08 +08:00
|
|
|
|
static void insert_step_resume_breakpoint_at_frame (struct frame_info *step_frame);
|
2006-06-16 09:12:58 +08:00
|
|
|
|
static void insert_step_resume_breakpoint_at_caller (struct frame_info *);
|
2004-09-28 01:58:08 +08:00
|
|
|
|
static void insert_step_resume_breakpoint_at_sal (struct symtab_and_line sr_sal,
|
|
|
|
|
struct frame_id sr_id);
|
2008-05-05 03:39:00 +08:00
|
|
|
|
static void insert_longjmp_resume_breakpoint (CORE_ADDR);
|
|
|
|
|
|
1999-08-31 09:14:27 +08:00
|
|
|
|
static void stop_stepping (struct execution_control_state *ecs);
|
|
|
|
|
static void prepare_to_wait (struct execution_control_state *ecs);
|
1999-09-09 08:02:17 +08:00
|
|
|
|
static void keep_going (struct execution_control_state *ecs);
|
2002-07-19 01:53:50 +08:00
|
|
|
|
static void print_stop_reason (enum inferior_stop_reason stop_reason,
|
|
|
|
|
int stop_info);
|
1999-08-31 09:14:27 +08:00
|
|
|
|
|
2008-10-24 07:11:21 +08:00
|
|
|
|
/* Callback for iterate over threads. If the thread is stopped, but
|
|
|
|
|
the user/frontend doesn't know about that yet, go through
|
|
|
|
|
normal_stop, as if the thread had just stopped now. ARG points at
|
|
|
|
|
a ptid. If PTID is MINUS_ONE_PTID, applies to all threads. If
|
|
|
|
|
ptid_is_pid(PTID) is true, applies to all threads of the process
|
|
|
|
|
pointed at by PTID. Otherwise, apply only to the thread pointed by
|
|
|
|
|
PTID. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
infrun_thread_stop_requested_callback (struct thread_info *info, void *arg)
|
|
|
|
|
{
|
|
|
|
|
ptid_t ptid = * (ptid_t *) arg;
|
|
|
|
|
|
|
|
|
|
if ((ptid_equal (info->ptid, ptid)
|
|
|
|
|
|| ptid_equal (minus_one_ptid, ptid)
|
|
|
|
|
|| (ptid_is_pid (ptid)
|
|
|
|
|
&& ptid_get_pid (ptid) == ptid_get_pid (info->ptid)))
|
|
|
|
|
&& is_running (info->ptid)
|
|
|
|
|
&& !is_executing (info->ptid))
|
|
|
|
|
{
|
|
|
|
|
struct cleanup *old_chain;
|
|
|
|
|
struct execution_control_state ecss;
|
|
|
|
|
struct execution_control_state *ecs = &ecss;
|
|
|
|
|
|
|
|
|
|
memset (ecs, 0, sizeof (*ecs));
|
|
|
|
|
|
|
|
|
|
old_chain = make_cleanup_restore_current_thread ();
|
|
|
|
|
|
|
|
|
|
switch_to_thread (info->ptid);
|
|
|
|
|
|
|
|
|
|
/* Go through handle_inferior_event/normal_stop, so we always
|
|
|
|
|
have consistent output as if the stop event had been
|
|
|
|
|
reported. */
|
|
|
|
|
ecs->ptid = info->ptid;
|
2009-05-25 05:06:53 +08:00
|
|
|
|
ecs->event_thread = find_thread_ptid (info->ptid);
|
2008-10-24 07:11:21 +08:00
|
|
|
|
ecs->ws.kind = TARGET_WAITKIND_STOPPED;
|
|
|
|
|
ecs->ws.value.sig = TARGET_SIGNAL_0;
|
|
|
|
|
|
|
|
|
|
handle_inferior_event (ecs);
|
|
|
|
|
|
|
|
|
|
if (!ecs->wait_some_more)
|
|
|
|
|
{
|
|
|
|
|
struct thread_info *tp;
|
|
|
|
|
|
|
|
|
|
normal_stop ();
|
|
|
|
|
|
|
|
|
|
/* Finish off the continuations. The continations
|
|
|
|
|
themselves are responsible for realising the thread
|
|
|
|
|
didn't finish what it was supposed to do. */
|
|
|
|
|
tp = inferior_thread ();
|
|
|
|
|
do_all_intermediate_continuations_thread (tp);
|
|
|
|
|
do_all_continuations_thread (tp);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
do_cleanups (old_chain);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This function is attached as a "thread_stop_requested" observer.
|
|
|
|
|
Cleanup local state that assumed the PTID was to be resumed, and
|
|
|
|
|
report the stop to the frontend. */
|
|
|
|
|
|
2008-02-21 Pedro Alves <pedro@codesorcery.com>
Silence a few -Wmissing-prototypes warnings.
PR build/9877:
* amd64-nat.c: Include "amd64-nat.h".
* fork-child.c (_initialize_fork_child): Ditto.
* gcore.c (_initialize_gcore): Ditto.
* inf-ptrace.c: Include "inf-ptrace.h".
(inf_ptrace_store_registers): Make it static.
* linux-nat.c (linux_nat_terminal_ours): Make it static.
(_initialize_linux_nat): Declare before definition.
* linux-tdep.c: Include "linux-tdep.h".
* linux-thread-db.c (_initialize_thread_db): Declare before
definition.
* proc-service.c (_initialize_proc_service): Ditto.
* remote.c (remote_send_printf): Make it static.
* solib.c: Include "solib.h".
* symfile-mem.c (_initialize_symfile_mem): Declare before
definition.
* ada-lang.c (ada_la_decode, ada_match_name)
(ada_suppress_symbol_printing, ada_is_array_type)
(ada_value_ptr_subscript, ada_array_length)
(ada_to_static_fixed_value): Make them static.
(_initialize_ada_language): Declare before definition.
* ada-tasks.c (ada_get_task_number, ada_get_environment_task)
(ada_task_list_changed, ada_new_objfile_observer): Make them
static.
(_initialize_tasks): Declare before definition.
* addrmap.c (_initialize_addrmap): Declare before definition.
* auxv.c (default_auxv_parse): Make it static.
* bfd-target.c (target_bfd_xfer_partial, target_bfd_xclose): Make
them static.
* breakpoint.c (remove_sal): Add line break.
(expand_line_sal_maybe): Make it static.
* cp-name-parser.y: Include "cp-support.h".
* cp-valprint.c (cp_find_class_member): Make it static.
* eval.c (value_f90_subarray): Ditto.
* exceptions.c (print_any_exception): Ditto.
* findcmd.c (_initialize_mem_search): Declare before definition.
* frame.c (frame_observer_target_changed): Make it static.
* gnu-v3-abi.c (gnuv3_find_method_in): Make it static.
* inf-child.c: Include "inf-child.h".
* inferior.h (valid_inferior_id): Rename to ...
(valid_gdb_inferior_id): ... this.
* infrun.c (infrun_thread_stop_requested, siginfo_make_value):
Make them static.
* jv-lang.c (java_language_arch_info): Make it static.
* m2-typeprint.c (m2_get_discrete_bounds): Ditto.
* osdata.c (info_osdata_command): Make it static.
* regcache.c (regcache_observer_target_changed): Make it static.
* reverse.c (_initialize_reverse): Declare before definition.
* stabsread.c (cleanup_undefined_types_noname)
(cleanup_undefined_types_1): Make them static.
* symfile.c (place_section): Make it static.
* symtab.c (find_pc_sect_psymtab_closer): Make it static.
* target-descriptions.c (_initialize_target_descriptions): Declare
before definition.
* target.c (default_get_ada_task_ptid, find_default_can_async_p)
(find_default_is_async_p, find_default_supports_non_stop): Make
them static.
(target_supports_non_stop): Add prototype.
(dummy_pid_to_str): Make it static.
* utils.c (_initialize_utils): Declare before definition.
* ada-exp.y (_initialize_ada_exp): Declare before definition.
* solib-svr4.c (HAS_LM_DYNAMIC_FROM_LINK_MAP): Add a prototype.
* target.h (struct target_ops): Add a prototype to the
to_can_execute_reverse callback.
* macroscope.c (_initialize_macroscope): Declare before definition.
* cp-namespace.c (_initialize_cp_namespace): Declare before definition.
* python/python.c (_initialize_python): Declare before definition.
* tui/tui-command.c: Include "tui/tui-command.h".
* tui/tui-data.c (init_content_element, init_win_info): Make them
static.
* tui/tui-disasm.c: Include "tui/tui-disasm.h".
* tui/tui-interp.c (_initialize_tui_interp): Declare before
definition.
* tui/tui-layout.c: Include "tui/tui-layout.h".
(_initialize_tui_layout): Declare before definition.
* tui/tui-regs.c: Include "tui/tui-regs.h".
(tui_display_reg_element_at_line): Make it static.
(_initialize_tui_regs): Declare before definition.
* tui/tui-stack.c (_initialize_tui_stack): Declare before
definition.
* tui/tui-win.c: Include "tui/tui-win.h".
(_initialize_tui_win): Declare before definition.
(tui_sigwinch_handler): Make it static. Wrap in ifdef SIGWINCH.
* tui/tui-win.h (tui_sigwinch_handler): Delete declaration.
(tui_get_cmd_list): Add a prototype.
* tui/tui-windata.c: Include tui-windata.h.
* tui/tui-wingeneral.c (box_win): Make it static.
* cli/cli-logging.c (show_logging_command): Make it static.
(_initialize_cli_logging): Declare before definition.
* mi/mi-common.c (_initialize_gdb_mi_common): Declare before
definition.
2009-02-22 00:14:50 +08:00
|
|
|
|
static void
|
2008-10-24 07:11:21 +08:00
|
|
|
|
infrun_thread_stop_requested (ptid_t ptid)
|
|
|
|
|
{
|
|
|
|
|
struct displaced_step_request *it, *next, *prev = NULL;
|
|
|
|
|
|
|
|
|
|
/* PTID was requested to stop. Remove it from the displaced
|
|
|
|
|
stepping queue, so we don't try to resume it automatically. */
|
|
|
|
|
for (it = displaced_step_request_queue; it; it = next)
|
|
|
|
|
{
|
|
|
|
|
next = it->next;
|
|
|
|
|
|
|
|
|
|
if (ptid_equal (it->ptid, ptid)
|
|
|
|
|
|| ptid_equal (minus_one_ptid, ptid)
|
|
|
|
|
|| (ptid_is_pid (ptid)
|
|
|
|
|
&& ptid_get_pid (ptid) == ptid_get_pid (it->ptid)))
|
|
|
|
|
{
|
|
|
|
|
if (displaced_step_request_queue == it)
|
|
|
|
|
displaced_step_request_queue = it->next;
|
|
|
|
|
else
|
|
|
|
|
prev->next = it->next;
|
|
|
|
|
|
|
|
|
|
xfree (it);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
prev = it;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
iterate_over_threads (infrun_thread_stop_requested_callback, &ptid);
|
|
|
|
|
}
|
|
|
|
|
|
2009-03-26 05:53:11 +08:00
|
|
|
|
static void
|
|
|
|
|
infrun_thread_thread_exit (struct thread_info *tp, int silent)
|
|
|
|
|
{
|
|
|
|
|
if (ptid_equal (target_last_wait_ptid, tp->ptid))
|
|
|
|
|
nullify_last_target_wait_ptid ();
|
|
|
|
|
}
|
|
|
|
|
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
/* Callback for iterate_over_threads. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
delete_step_resume_breakpoint_callback (struct thread_info *info, void *data)
|
|
|
|
|
{
|
|
|
|
|
if (is_exited (info->ptid))
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
delete_step_resume_breakpoint (info);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* In all-stop, delete the step resume breakpoint of any thread that
|
|
|
|
|
had one. In non-stop, delete the step resume breakpoint of the
|
|
|
|
|
thread that just stopped. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
delete_step_thread_step_resume_breakpoint (void)
|
|
|
|
|
{
|
|
|
|
|
if (!target_has_execution
|
|
|
|
|
|| ptid_equal (inferior_ptid, null_ptid))
|
|
|
|
|
/* If the inferior has exited, we have already deleted the step
|
|
|
|
|
resume breakpoints out of GDB's lists. */
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
if (non_stop)
|
|
|
|
|
{
|
|
|
|
|
/* If in non-stop mode, only delete the step-resume or
|
|
|
|
|
longjmp-resume breakpoint of the thread that just stopped
|
|
|
|
|
stepping. */
|
|
|
|
|
struct thread_info *tp = inferior_thread ();
|
|
|
|
|
delete_step_resume_breakpoint (tp);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
/* In all-stop mode, delete all step-resume and longjmp-resume
|
|
|
|
|
breakpoints of any thread that had them. */
|
|
|
|
|
iterate_over_threads (delete_step_resume_breakpoint_callback, NULL);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* A cleanup wrapper. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
delete_step_thread_step_resume_breakpoint_cleanup (void *arg)
|
|
|
|
|
{
|
|
|
|
|
delete_step_thread_step_resume_breakpoint ();
|
|
|
|
|
}
|
|
|
|
|
|
2009-03-02 07:18:36 +08:00
|
|
|
|
/* Pretty print the results of target_wait, for debugging purposes. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
print_target_wait_results (ptid_t waiton_ptid, ptid_t result_ptid,
|
|
|
|
|
const struct target_waitstatus *ws)
|
|
|
|
|
{
|
|
|
|
|
char *status_string = target_waitstatus_to_string (ws);
|
|
|
|
|
struct ui_file *tmp_stream = mem_fileopen ();
|
|
|
|
|
char *text;
|
|
|
|
|
long len;
|
|
|
|
|
|
|
|
|
|
/* The text is split over several lines because it was getting too long.
|
|
|
|
|
Call fprintf_unfiltered (gdb_stdlog) once so that the text is still
|
|
|
|
|
output as a unit; we want only one timestamp printed if debug_timestamp
|
|
|
|
|
is set. */
|
|
|
|
|
|
|
|
|
|
fprintf_unfiltered (tmp_stream,
|
|
|
|
|
"infrun: target_wait (%d", PIDGET (waiton_ptid));
|
|
|
|
|
if (PIDGET (waiton_ptid) != -1)
|
|
|
|
|
fprintf_unfiltered (tmp_stream,
|
|
|
|
|
" [%s]", target_pid_to_str (waiton_ptid));
|
|
|
|
|
fprintf_unfiltered (tmp_stream, ", status) =\n");
|
|
|
|
|
fprintf_unfiltered (tmp_stream,
|
|
|
|
|
"infrun: %d [%s],\n",
|
|
|
|
|
PIDGET (result_ptid), target_pid_to_str (result_ptid));
|
|
|
|
|
fprintf_unfiltered (tmp_stream,
|
|
|
|
|
"infrun: %s\n",
|
|
|
|
|
status_string);
|
|
|
|
|
|
|
|
|
|
text = ui_file_xstrdup (tmp_stream, &len);
|
|
|
|
|
|
|
|
|
|
/* This uses %s in part to handle %'s in the text, but also to avoid
|
|
|
|
|
a gcc error: the format attribute requires a string literal. */
|
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "%s", text);
|
|
|
|
|
|
|
|
|
|
xfree (status_string);
|
|
|
|
|
xfree (text);
|
|
|
|
|
ui_file_delete (tmp_stream);
|
|
|
|
|
}
|
|
|
|
|
|
1999-05-11 21:35:55 +08:00
|
|
|
|
/* Wait for control to return from inferior to debugger.
|
2008-01-30 05:11:24 +08:00
|
|
|
|
|
|
|
|
|
If TREAT_EXEC_AS_SIGTRAP is non-zero, then handle EXEC signals
|
|
|
|
|
as if they were SIGTRAP signals. This can be useful during
|
|
|
|
|
the startup sequence on some targets such as HP/UX, where
|
|
|
|
|
we receive an EXEC event instead of the expected SIGTRAP.
|
|
|
|
|
|
1999-05-11 21:35:55 +08:00
|
|
|
|
If inferior gets a signal, we may decide to start it up again
|
|
|
|
|
instead of returning. That is why there is a loop in this function.
|
|
|
|
|
When this function actually returns it means the inferior
|
|
|
|
|
should be left stopped and GDB should read more commands. */
|
|
|
|
|
|
|
|
|
|
void
|
2008-01-30 05:11:24 +08:00
|
|
|
|
wait_for_inferior (int treat_exec_as_sigtrap)
|
1999-05-11 21:35:55 +08:00
|
|
|
|
{
|
|
|
|
|
struct cleanup *old_cleanups;
|
Refactor infrun a bit.
* infrun.c (currently_stepping): Take a struct
thread_stepping_state instead of an execution_control_state.
(struct thread_stepping_state): New, split from
execution_control_state.
(gtss, tss): New globals.
(proceed): Clear the stepping state, set previous_inferior_ptid
and clear infwait state.
(init_wait_for_inferior): Clear the stepping state,
previous_inferior_ptid and infwait state.
(waiton_ptid, infwait_state): New, split from
execution_control_state.
(struct execution_control_state): Members that persist through
events moved out to either struct thred_stepping_state or made
global. Deleted unneeded wp, saved_inferior_ptid, tmpstatus.
(wait_for_inferior, fetch_inferior_event): Use local
execution_control_state. Update to execution_control_state split.
(init_execution_control_state): Adjust.
(init_thread_stepping_state): New, extracted from
init_execution_control_state.
(context_switch): Take a ptid instead of an
execution_control_state.
(context_switch_to): Adjust.
(adjust_pc_after_break): Adjust.
(init_infwait_state): New.
(handle_inferior_event): Adjust.
2008-07-10 06:33:16 +08:00
|
|
|
|
struct execution_control_state ecss;
|
1999-05-11 21:35:55 +08:00
|
|
|
|
struct execution_control_state *ecs;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2008-01-30 05:11:24 +08:00
|
|
|
|
fprintf_unfiltered
|
|
|
|
|
(gdb_stdlog, "infrun: wait_for_inferior (treat_exec_as_sigtrap=%d)\n",
|
|
|
|
|
treat_exec_as_sigtrap);
|
2004-11-09 01:25:23 +08:00
|
|
|
|
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
old_cleanups =
|
|
|
|
|
make_cleanup (delete_step_thread_step_resume_breakpoint_cleanup, NULL);
|
1999-05-11 21:35:55 +08:00
|
|
|
|
|
|
|
|
|
ecs = &ecss;
|
Refactor infrun a bit.
* infrun.c (currently_stepping): Take a struct
thread_stepping_state instead of an execution_control_state.
(struct thread_stepping_state): New, split from
execution_control_state.
(gtss, tss): New globals.
(proceed): Clear the stepping state, set previous_inferior_ptid
and clear infwait state.
(init_wait_for_inferior): Clear the stepping state,
previous_inferior_ptid and infwait state.
(waiton_ptid, infwait_state): New, split from
execution_control_state.
(struct execution_control_state): Members that persist through
events moved out to either struct thred_stepping_state or made
global. Deleted unneeded wp, saved_inferior_ptid, tmpstatus.
(wait_for_inferior, fetch_inferior_event): Use local
execution_control_state. Update to execution_control_state split.
(init_execution_control_state): Adjust.
(init_thread_stepping_state): New, extracted from
init_execution_control_state.
(context_switch): Take a ptid instead of an
execution_control_state.
(context_switch_to): Adjust.
(adjust_pc_after_break): Adjust.
(init_infwait_state): New.
(handle_inferior_event): Adjust.
2008-07-10 06:33:16 +08:00
|
|
|
|
memset (ecs, 0, sizeof (*ecs));
|
|
|
|
|
|
1999-05-11 21:35:55 +08:00
|
|
|
|
overlay_cache_invalid = 1;
|
|
|
|
|
|
2008-08-22 22:06:29 +08:00
|
|
|
|
/* We'll update this if & when we switch to a new thread. */
|
|
|
|
|
previous_inferior_ptid = inferior_ptid;
|
|
|
|
|
|
1999-05-11 21:35:55 +08:00
|
|
|
|
/* We have to invalidate the registers BEFORE calling target_wait
|
|
|
|
|
because they can be loaded from the target while in target_wait.
|
|
|
|
|
This makes remote debugging a bit more efficient for those
|
|
|
|
|
targets that provide critical registers as part of their normal
|
|
|
|
|
status mechanism. */
|
|
|
|
|
|
|
|
|
|
registers_changed ();
|
1999-05-05 22:45:51 +08:00
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
while (1)
|
|
|
|
|
{
|
2009-01-19 01:42:16 +08:00
|
|
|
|
struct cleanup *old_chain;
|
|
|
|
|
|
2004-04-21 Andrew Cagney <cagney@redhat.com>
* annotate.h (deprecated_annotate_starting_hook)
(deprecated_annotate_stopped_hook)
(deprecated_annotate_exited_hook)
(deprecated_annotate_signal_hook)
(deprecated_annotate_signalled_hook): Deprecate.
* tracepoint.h (deprecated_create_tracepoint_hook)
(deprecated_delete_tracepoint_hook)
(deprecated_modify_tracepoint_hook)
(deprecated_trace_find_hook)
(deprecated_trace_start_stop_hook): Deprecate.
* target.h (deprecated_target_new_objfile_hook): Deprecate.
* remote.h (deprecated_target_resume_hook)
(deprecated_target_wait_loop_hook): Deprecate.
* gdbcore.h (deprecated_exec_file_display_hook)
(deprecated_file_changed_hook): Deprecate.
* frame.h (deprecated_selected_frame_level_changed_hook): Deprecate.
* defs.h (deprecated_modify_breakpoint_hook)
(deprecated_command_loop_hook, deprecated_show_load_progress)
(deprecated_print_frame_info_listing_hook)
(deprecated_query_hook, deprecated_warning_hook)
(deprecated_flush_hook, deprecated_create_breakpoint_hook)
(deprecated_delete_breakpoint_hook)
(deprecated_interactive_hook, deprecated_registers_changed_hook)
(deprecated_readline_begin_hook, deprecated_readline_hook)
(deprecated_readline_end_hook, deprecated_register_changed_hook)
(deprecated_memory_changed_hook, deprecated_init_ui_hook)
(deprecated_context_hook, deprecated_target_wait_hook)
(deprecated_attach_hook, deprecated_detach_hook)
(deprecated_call_command_hook, deprecated_set_hook)
(deprecated_error_hook, deprecated_error_begin_hook)
(deprecated_ui_load_progress_hook): Deprecate.
* valops.c, uw-thread.c, utils.c, tui/tui-io.c: Update.
* tui/tui-hooks.c, tracepoint.c, top.c, thread-db.c: Update.
* target.c, symfile.c, stack.c, sol-thread.c, rs6000-nat.c: Update.
* remote.c, remote-mips.c, regcache.c, mi/mi-interp.c: Update.
* main.c, interps.c, infcmd.c, hpux-thread.c, frame.c: Update.
* exec.c, dsrec.c, d10v-tdep.c, corefile.c, complaints.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, breakpoint.c: Update.
* annotate.c, aix-thread.c: Update.
2004-04-22 07:52:21 +08:00
|
|
|
|
if (deprecated_target_wait_hook)
|
2009-05-21 23:48:42 +08:00
|
|
|
|
ecs->ptid = deprecated_target_wait_hook (waiton_ptid, &ecs->ws, 0);
|
1999-05-11 21:35:55 +08:00
|
|
|
|
else
|
2009-05-21 23:48:42 +08:00
|
|
|
|
ecs->ptid = target_wait (waiton_ptid, &ecs->ws, 0);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2009-02-02 07:31:03 +08:00
|
|
|
|
if (debug_infrun)
|
2009-03-02 07:18:36 +08:00
|
|
|
|
print_target_wait_results (waiton_ptid, ecs->ptid, &ecs->ws);
|
2009-02-02 07:31:03 +08:00
|
|
|
|
|
2008-01-30 05:11:24 +08:00
|
|
|
|
if (treat_exec_as_sigtrap && ecs->ws.kind == TARGET_WAITKIND_EXECD)
|
|
|
|
|
{
|
|
|
|
|
xfree (ecs->ws.value.execd_pathname);
|
|
|
|
|
ecs->ws.kind = TARGET_WAITKIND_STOPPED;
|
|
|
|
|
ecs->ws.value.sig = TARGET_SIGNAL_TRAP;
|
|
|
|
|
}
|
|
|
|
|
|
2009-01-19 01:42:16 +08:00
|
|
|
|
/* If an error happens while handling the event, propagate GDB's
|
|
|
|
|
knowledge of the executing state to the frontend/user running
|
|
|
|
|
state. */
|
|
|
|
|
old_chain = make_cleanup (finish_thread_state_cleanup, &minus_one_ptid);
|
|
|
|
|
|
1999-05-11 21:35:55 +08:00
|
|
|
|
/* Now figure out what to do with the result of the result. */
|
|
|
|
|
handle_inferior_event (ecs);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2009-01-19 01:42:16 +08:00
|
|
|
|
/* No error, don't finish the state yet. */
|
|
|
|
|
discard_cleanups (old_chain);
|
|
|
|
|
|
1999-05-11 21:35:55 +08:00
|
|
|
|
if (!ecs->wait_some_more)
|
|
|
|
|
break;
|
|
|
|
|
}
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
|
1999-05-11 21:35:55 +08:00
|
|
|
|
do_cleanups (old_cleanups);
|
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
1999-07-06 01:58:44 +08:00
|
|
|
|
/* Asynchronous version of wait_for_inferior. It is called by the
|
|
|
|
|
event loop whenever a change of state is detected on the file
|
|
|
|
|
descriptor corresponding to the target. It can be called more than
|
|
|
|
|
once to complete a single execution command. In such cases we need
|
Per-thread commands.
* gdbthread.h: Remove unneeded forward declarations.
Include "inferior.h".
(struct thread_info): Add continuations,
intermediate_continuations, proceed_to_finish, step_over_calls,
stop_step, step_multi and stop_signal members.
(save_infrun_state): Add continuations,
intermediate_continuations, proceed_to_finish, step_over_calls,
stop_step, step_multi, stop_signal and stop_bpstat parameters.
(load_infrun_state): Add continuations,
intermediate_continuations, proceed_to_finish, step_over_calls,
stop_step, step_multi, stop_signal and stop_bpstat parameters.
* thread.c (load_infrun_state): In non-stop mode, load
continuations, intermediate_continuations, proceed_to_finish,
step_over_calls, stop_step, step_multi and stop_signal.
(save_infrun_state): Store continuations,
intermediate_continuations, proceed_to_finish, step_over_calls,
stop_step, step_multi, stop_signal and stop_bpstat.
(save_infrun_state): Store continuations,
intermediate_continuations, proceed_to_finish, step_over_calls,
stop_step, step_multi, stop_signal and stop_bpstat.
(free_thread): Clear The thread's stop_bpstat.
* inferior.h (context_switch_to): Declare.
* infrun.c (ecss): New global.
(context_switch): Context switch continuations,
intermediate_continuations, proceed_to_finish, step_over_calls,
stop_step, step_multi, stop_signal and stop_bpstat.
(wait_for_inferior): Use global ecss.
(async_ecss, async_ecs): Delete.
(fetch_inferior_event): Use global ecss.
(context_switch_to): New.
* top.c (execute_command): In non-stop, only check if the current
thread is running, in all-stop, check if there's any thread
running.
* breakpoint.c (bpstat_remove_breakpoint): New.
(bpstat_remove_breakpoint_callback): New.
(delete_breakpoint): Clear the stop_bpstats of all threads.
* mi/mi-main.c (mi_cmd_execute): In non-stop, only check if the
current thread is running, in all-stop, check if there's any
thread running.
* Makefile.in (gdbthread_h): Depend on $(inferior_h).
2008-07-10 06:30:46 +08:00
|
|
|
|
to keep the state in a global variable ECSS. If it is the last time
|
|
|
|
|
that this function is called for a single execution command, then
|
|
|
|
|
report to the user that the inferior has stopped, and do the
|
|
|
|
|
necessary cleanups. */
|
1999-07-06 01:58:44 +08:00
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 09:48:28 +08:00
|
|
|
|
fetch_inferior_event (void *client_data)
|
1999-07-06 01:58:44 +08:00
|
|
|
|
{
|
Refactor infrun a bit.
* infrun.c (currently_stepping): Take a struct
thread_stepping_state instead of an execution_control_state.
(struct thread_stepping_state): New, split from
execution_control_state.
(gtss, tss): New globals.
(proceed): Clear the stepping state, set previous_inferior_ptid
and clear infwait state.
(init_wait_for_inferior): Clear the stepping state,
previous_inferior_ptid and infwait state.
(waiton_ptid, infwait_state): New, split from
execution_control_state.
(struct execution_control_state): Members that persist through
events moved out to either struct thred_stepping_state or made
global. Deleted unneeded wp, saved_inferior_ptid, tmpstatus.
(wait_for_inferior, fetch_inferior_event): Use local
execution_control_state. Update to execution_control_state split.
(init_execution_control_state): Adjust.
(init_thread_stepping_state): New, extracted from
init_execution_control_state.
(context_switch): Take a ptid instead of an
execution_control_state.
(context_switch_to): Adjust.
(adjust_pc_after_break): Adjust.
(init_infwait_state): New.
(handle_inferior_event): Adjust.
2008-07-10 06:33:16 +08:00
|
|
|
|
struct execution_control_state ecss;
|
Per-thread commands.
* gdbthread.h: Remove unneeded forward declarations.
Include "inferior.h".
(struct thread_info): Add continuations,
intermediate_continuations, proceed_to_finish, step_over_calls,
stop_step, step_multi and stop_signal members.
(save_infrun_state): Add continuations,
intermediate_continuations, proceed_to_finish, step_over_calls,
stop_step, step_multi, stop_signal and stop_bpstat parameters.
(load_infrun_state): Add continuations,
intermediate_continuations, proceed_to_finish, step_over_calls,
stop_step, step_multi, stop_signal and stop_bpstat parameters.
* thread.c (load_infrun_state): In non-stop mode, load
continuations, intermediate_continuations, proceed_to_finish,
step_over_calls, stop_step, step_multi and stop_signal.
(save_infrun_state): Store continuations,
intermediate_continuations, proceed_to_finish, step_over_calls,
stop_step, step_multi, stop_signal and stop_bpstat.
(save_infrun_state): Store continuations,
intermediate_continuations, proceed_to_finish, step_over_calls,
stop_step, step_multi, stop_signal and stop_bpstat.
(free_thread): Clear The thread's stop_bpstat.
* inferior.h (context_switch_to): Declare.
* infrun.c (ecss): New global.
(context_switch): Context switch continuations,
intermediate_continuations, proceed_to_finish, step_over_calls,
stop_step, step_multi, stop_signal and stop_bpstat.
(wait_for_inferior): Use global ecss.
(async_ecss, async_ecs): Delete.
(fetch_inferior_event): Use global ecss.
(context_switch_to): New.
* top.c (execute_command): In non-stop, only check if the current
thread is running, in all-stop, check if there's any thread
running.
* breakpoint.c (bpstat_remove_breakpoint): New.
(bpstat_remove_breakpoint_callback): New.
(delete_breakpoint): Clear the stop_bpstats of all threads.
* mi/mi-main.c (mi_cmd_execute): In non-stop, only check if the
current thread is running, in all-stop, check if there's any
thread running.
* Makefile.in (gdbthread_h): Depend on $(inferior_h).
2008-07-10 06:30:46 +08:00
|
|
|
|
struct execution_control_state *ecs = &ecss;
|
Exited threads.
* thread.c (enum thread_state): New.
(thread_state main_thread_running): Delete, in favor of...
(thread_state main_thread_state): ... this. Update throughout.
(clear_thread_inferior_resources): New, split from free_thread.
(free_thread): Call clear_thread_inferior_resources.
(init_thread_list): Set main thread to stopped state.
(add_thread_silent): Take care of PTID reuses.
(delete_thread): If deleting inferior_ptid or a thread with
refcount > 0, mark it as exited, but still keep it in the list.
Only notify of thread exits, if we haven't done so yet.
(iterate_over_threads): Make it safe to delete threads while
iterating over them.
(do_captured_list_thread_ids): Don't account for exited threads.
(thread_alive): Check for the THREAD_EXITED state, and don't set
ptid to -1 on exited threads.
(set_running): Update to account for extra possible states.
(is_thread_state): New.
(is_stopped, is_exited): New.
(is_running): Implement in terms of is_thread_state.
(any_running): Update.
(print_thread_info): Update. Account for exited threads. Don't
warn about missed frame restoring here, its done in the cleanup.
(switch_to_thread): Don't read from a thread that has gone.
(restore_current_thread): In non-stop mode, do a full context
switch.
(restore_selected_frame): Add a frame_level argument. Rewrite.
(struct current_thread_cleanup): Add selected_frame_level and
was_stopped members.
(do_restore_current_thread_cleanup): Check if thread was stopped
and still is, and if the target has registers, stack and memory
before restoring the selected frame. Don't delete the cleanup
argument here.
(restore_current_thread_cleanup_dtor): New.
(make_cleanup_restore_current_thread): Remove all arguments.
Rewrite.
(thread_apply_all_command): Update. Prune threads.
(thread_apply_command): Update.
(thread_command): Account for currently selected exited thread.
(do_captured_thread_select): Check for a running thread. Prune
threads.
(_initialize_thread): Make "info threads", "thread", "thread
apply", and "thread apply all" appliable without a selected thread.
* gdbthread.h (struct thread_info): Replace running_ by state_.
Add refcount.
(is_exited, is_stopped): Declare.
(make_cleanup_restore_current_thread): Remove all arguments.
* infrun.c: Include "event-top.h".
(fetch_inferior_event): In non-stop mode, restore selected thread
and frame after handling the event and running breakpoint
commands. Display GDB prompt if needed.
(normal_stop): In non-stop mode, don't print thread switching
notice.
* cli/cli-decode.c (set_cmd_no_selected_thread_ok)
(get_cmd_no_selected_thread_ok): New.
* cli/cli-decode.h (CMD_NO_SELECTED_THREAD_OK): New.
(set_cmd_no_selected_thread_ok, get_cmd_no_selected_thread_ok):
Declare.
* cli/cli-cmds.c: Set "pwd", "help", "info", "show" as
no-selected-thread ok.
* top.c (execute_command): Check for non no-selected-thread-ok
commands.
* linux-nat.c (struct saved_ptids, threads_to_delete)
(record_dead_thread, prune_lwps): Delete.
(exit_lwp): Unconditionally delete thread.
(linux_nat_resume): Remove prune_lwps call.
* infcmd.c (proceed_thread_callback): Check if !is_stopped instead
of is_running. Adjust to make_cleanup_restore_current_thread
interface change.
* mi/mi-main.c (mi_cmd_execute): Only allow a few commands if the
selected thread has exited.
* inf-loop.c (inferior_event_handler): Don't display the prompt
here.
* varobj.c (c_value_of_root): Update.
* defs.h (make_cleanup_dtor): Declare.
* utils.c (make_cleanup_dtor): New.
* Makefile.in (infrun.o): Depend on $(event_top_h).
2008-07-11 19:07:39 +08:00
|
|
|
|
struct cleanup *old_chain = make_cleanup (null_cleanup, NULL);
|
2009-01-19 01:42:16 +08:00
|
|
|
|
struct cleanup *ts_old_chain;
|
Exited threads.
* thread.c (enum thread_state): New.
(thread_state main_thread_running): Delete, in favor of...
(thread_state main_thread_state): ... this. Update throughout.
(clear_thread_inferior_resources): New, split from free_thread.
(free_thread): Call clear_thread_inferior_resources.
(init_thread_list): Set main thread to stopped state.
(add_thread_silent): Take care of PTID reuses.
(delete_thread): If deleting inferior_ptid or a thread with
refcount > 0, mark it as exited, but still keep it in the list.
Only notify of thread exits, if we haven't done so yet.
(iterate_over_threads): Make it safe to delete threads while
iterating over them.
(do_captured_list_thread_ids): Don't account for exited threads.
(thread_alive): Check for the THREAD_EXITED state, and don't set
ptid to -1 on exited threads.
(set_running): Update to account for extra possible states.
(is_thread_state): New.
(is_stopped, is_exited): New.
(is_running): Implement in terms of is_thread_state.
(any_running): Update.
(print_thread_info): Update. Account for exited threads. Don't
warn about missed frame restoring here, its done in the cleanup.
(switch_to_thread): Don't read from a thread that has gone.
(restore_current_thread): In non-stop mode, do a full context
switch.
(restore_selected_frame): Add a frame_level argument. Rewrite.
(struct current_thread_cleanup): Add selected_frame_level and
was_stopped members.
(do_restore_current_thread_cleanup): Check if thread was stopped
and still is, and if the target has registers, stack and memory
before restoring the selected frame. Don't delete the cleanup
argument here.
(restore_current_thread_cleanup_dtor): New.
(make_cleanup_restore_current_thread): Remove all arguments.
Rewrite.
(thread_apply_all_command): Update. Prune threads.
(thread_apply_command): Update.
(thread_command): Account for currently selected exited thread.
(do_captured_thread_select): Check for a running thread. Prune
threads.
(_initialize_thread): Make "info threads", "thread", "thread
apply", and "thread apply all" appliable without a selected thread.
* gdbthread.h (struct thread_info): Replace running_ by state_.
Add refcount.
(is_exited, is_stopped): Declare.
(make_cleanup_restore_current_thread): Remove all arguments.
* infrun.c: Include "event-top.h".
(fetch_inferior_event): In non-stop mode, restore selected thread
and frame after handling the event and running breakpoint
commands. Display GDB prompt if needed.
(normal_stop): In non-stop mode, don't print thread switching
notice.
* cli/cli-decode.c (set_cmd_no_selected_thread_ok)
(get_cmd_no_selected_thread_ok): New.
* cli/cli-decode.h (CMD_NO_SELECTED_THREAD_OK): New.
(set_cmd_no_selected_thread_ok, get_cmd_no_selected_thread_ok):
Declare.
* cli/cli-cmds.c: Set "pwd", "help", "info", "show" as
no-selected-thread ok.
* top.c (execute_command): Check for non no-selected-thread-ok
commands.
* linux-nat.c (struct saved_ptids, threads_to_delete)
(record_dead_thread, prune_lwps): Delete.
(exit_lwp): Unconditionally delete thread.
(linux_nat_resume): Remove prune_lwps call.
* infcmd.c (proceed_thread_callback): Check if !is_stopped instead
of is_running. Adjust to make_cleanup_restore_current_thread
interface change.
* mi/mi-main.c (mi_cmd_execute): Only allow a few commands if the
selected thread has exited.
* inf-loop.c (inferior_event_handler): Don't display the prompt
here.
* varobj.c (c_value_of_root): Update.
* defs.h (make_cleanup_dtor): Declare.
* utils.c (make_cleanup_dtor): New.
* Makefile.in (infrun.o): Depend on $(event_top_h).
2008-07-11 19:07:39 +08:00
|
|
|
|
int was_sync = sync_execution;
|
1999-07-06 01:58:44 +08:00
|
|
|
|
|
Refactor infrun a bit.
* infrun.c (currently_stepping): Take a struct
thread_stepping_state instead of an execution_control_state.
(struct thread_stepping_state): New, split from
execution_control_state.
(gtss, tss): New globals.
(proceed): Clear the stepping state, set previous_inferior_ptid
and clear infwait state.
(init_wait_for_inferior): Clear the stepping state,
previous_inferior_ptid and infwait state.
(waiton_ptid, infwait_state): New, split from
execution_control_state.
(struct execution_control_state): Members that persist through
events moved out to either struct thred_stepping_state or made
global. Deleted unneeded wp, saved_inferior_ptid, tmpstatus.
(wait_for_inferior, fetch_inferior_event): Use local
execution_control_state. Update to execution_control_state split.
(init_execution_control_state): Adjust.
(init_thread_stepping_state): New, extracted from
init_execution_control_state.
(context_switch): Take a ptid instead of an
execution_control_state.
(context_switch_to): Adjust.
(adjust_pc_after_break): Adjust.
(init_infwait_state): New.
(handle_inferior_event): Adjust.
2008-07-10 06:33:16 +08:00
|
|
|
|
memset (ecs, 0, sizeof (*ecs));
|
|
|
|
|
|
2008-07-10 06:36:51 +08:00
|
|
|
|
overlay_cache_invalid = 1;
|
1999-07-06 01:58:44 +08:00
|
|
|
|
|
2008-08-22 22:06:29 +08:00
|
|
|
|
/* We can only rely on wait_for_more being correct before handling
|
|
|
|
|
the event in all-stop, but previous_inferior_ptid isn't used in
|
|
|
|
|
non-stop. */
|
|
|
|
|
if (!ecs->wait_some_more)
|
|
|
|
|
/* We'll update this if & when we switch to a new thread. */
|
|
|
|
|
previous_inferior_ptid = inferior_ptid;
|
|
|
|
|
|
Exited threads.
* thread.c (enum thread_state): New.
(thread_state main_thread_running): Delete, in favor of...
(thread_state main_thread_state): ... this. Update throughout.
(clear_thread_inferior_resources): New, split from free_thread.
(free_thread): Call clear_thread_inferior_resources.
(init_thread_list): Set main thread to stopped state.
(add_thread_silent): Take care of PTID reuses.
(delete_thread): If deleting inferior_ptid or a thread with
refcount > 0, mark it as exited, but still keep it in the list.
Only notify of thread exits, if we haven't done so yet.
(iterate_over_threads): Make it safe to delete threads while
iterating over them.
(do_captured_list_thread_ids): Don't account for exited threads.
(thread_alive): Check for the THREAD_EXITED state, and don't set
ptid to -1 on exited threads.
(set_running): Update to account for extra possible states.
(is_thread_state): New.
(is_stopped, is_exited): New.
(is_running): Implement in terms of is_thread_state.
(any_running): Update.
(print_thread_info): Update. Account for exited threads. Don't
warn about missed frame restoring here, its done in the cleanup.
(switch_to_thread): Don't read from a thread that has gone.
(restore_current_thread): In non-stop mode, do a full context
switch.
(restore_selected_frame): Add a frame_level argument. Rewrite.
(struct current_thread_cleanup): Add selected_frame_level and
was_stopped members.
(do_restore_current_thread_cleanup): Check if thread was stopped
and still is, and if the target has registers, stack and memory
before restoring the selected frame. Don't delete the cleanup
argument here.
(restore_current_thread_cleanup_dtor): New.
(make_cleanup_restore_current_thread): Remove all arguments.
Rewrite.
(thread_apply_all_command): Update. Prune threads.
(thread_apply_command): Update.
(thread_command): Account for currently selected exited thread.
(do_captured_thread_select): Check for a running thread. Prune
threads.
(_initialize_thread): Make "info threads", "thread", "thread
apply", and "thread apply all" appliable without a selected thread.
* gdbthread.h (struct thread_info): Replace running_ by state_.
Add refcount.
(is_exited, is_stopped): Declare.
(make_cleanup_restore_current_thread): Remove all arguments.
* infrun.c: Include "event-top.h".
(fetch_inferior_event): In non-stop mode, restore selected thread
and frame after handling the event and running breakpoint
commands. Display GDB prompt if needed.
(normal_stop): In non-stop mode, don't print thread switching
notice.
* cli/cli-decode.c (set_cmd_no_selected_thread_ok)
(get_cmd_no_selected_thread_ok): New.
* cli/cli-decode.h (CMD_NO_SELECTED_THREAD_OK): New.
(set_cmd_no_selected_thread_ok, get_cmd_no_selected_thread_ok):
Declare.
* cli/cli-cmds.c: Set "pwd", "help", "info", "show" as
no-selected-thread ok.
* top.c (execute_command): Check for non no-selected-thread-ok
commands.
* linux-nat.c (struct saved_ptids, threads_to_delete)
(record_dead_thread, prune_lwps): Delete.
(exit_lwp): Unconditionally delete thread.
(linux_nat_resume): Remove prune_lwps call.
* infcmd.c (proceed_thread_callback): Check if !is_stopped instead
of is_running. Adjust to make_cleanup_restore_current_thread
interface change.
* mi/mi-main.c (mi_cmd_execute): Only allow a few commands if the
selected thread has exited.
* inf-loop.c (inferior_event_handler): Don't display the prompt
here.
* varobj.c (c_value_of_root): Update.
* defs.h (make_cleanup_dtor): Declare.
* utils.c (make_cleanup_dtor): New.
* Makefile.in (infrun.o): Depend on $(event_top_h).
2008-07-11 19:07:39 +08:00
|
|
|
|
if (non_stop)
|
|
|
|
|
/* In non-stop mode, the user/frontend should not notice a thread
|
|
|
|
|
switch due to internal events. Make sure we reverse to the
|
|
|
|
|
user selected thread and frame after handling the event and
|
|
|
|
|
running any breakpoint commands. */
|
|
|
|
|
make_cleanup_restore_current_thread ();
|
|
|
|
|
|
2008-07-10 06:36:51 +08:00
|
|
|
|
/* We have to invalidate the registers BEFORE calling target_wait
|
|
|
|
|
because they can be loaded from the target while in target_wait.
|
|
|
|
|
This makes remote debugging a bit more efficient for those
|
|
|
|
|
targets that provide critical registers as part of their normal
|
|
|
|
|
status mechanism. */
|
1999-07-06 01:58:44 +08:00
|
|
|
|
|
2008-07-10 06:36:51 +08:00
|
|
|
|
registers_changed ();
|
1999-07-06 01:58:44 +08:00
|
|
|
|
|
2004-04-21 Andrew Cagney <cagney@redhat.com>
* annotate.h (deprecated_annotate_starting_hook)
(deprecated_annotate_stopped_hook)
(deprecated_annotate_exited_hook)
(deprecated_annotate_signal_hook)
(deprecated_annotate_signalled_hook): Deprecate.
* tracepoint.h (deprecated_create_tracepoint_hook)
(deprecated_delete_tracepoint_hook)
(deprecated_modify_tracepoint_hook)
(deprecated_trace_find_hook)
(deprecated_trace_start_stop_hook): Deprecate.
* target.h (deprecated_target_new_objfile_hook): Deprecate.
* remote.h (deprecated_target_resume_hook)
(deprecated_target_wait_loop_hook): Deprecate.
* gdbcore.h (deprecated_exec_file_display_hook)
(deprecated_file_changed_hook): Deprecate.
* frame.h (deprecated_selected_frame_level_changed_hook): Deprecate.
* defs.h (deprecated_modify_breakpoint_hook)
(deprecated_command_loop_hook, deprecated_show_load_progress)
(deprecated_print_frame_info_listing_hook)
(deprecated_query_hook, deprecated_warning_hook)
(deprecated_flush_hook, deprecated_create_breakpoint_hook)
(deprecated_delete_breakpoint_hook)
(deprecated_interactive_hook, deprecated_registers_changed_hook)
(deprecated_readline_begin_hook, deprecated_readline_hook)
(deprecated_readline_end_hook, deprecated_register_changed_hook)
(deprecated_memory_changed_hook, deprecated_init_ui_hook)
(deprecated_context_hook, deprecated_target_wait_hook)
(deprecated_attach_hook, deprecated_detach_hook)
(deprecated_call_command_hook, deprecated_set_hook)
(deprecated_error_hook, deprecated_error_begin_hook)
(deprecated_ui_load_progress_hook): Deprecate.
* valops.c, uw-thread.c, utils.c, tui/tui-io.c: Update.
* tui/tui-hooks.c, tracepoint.c, top.c, thread-db.c: Update.
* target.c, symfile.c, stack.c, sol-thread.c, rs6000-nat.c: Update.
* remote.c, remote-mips.c, regcache.c, mi/mi-interp.c: Update.
* main.c, interps.c, infcmd.c, hpux-thread.c, frame.c: Update.
* exec.c, dsrec.c, d10v-tdep.c, corefile.c, complaints.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, breakpoint.c: Update.
* annotate.c, aix-thread.c: Update.
2004-04-22 07:52:21 +08:00
|
|
|
|
if (deprecated_target_wait_hook)
|
Per-thread commands.
* gdbthread.h: Remove unneeded forward declarations.
Include "inferior.h".
(struct thread_info): Add continuations,
intermediate_continuations, proceed_to_finish, step_over_calls,
stop_step, step_multi and stop_signal members.
(save_infrun_state): Add continuations,
intermediate_continuations, proceed_to_finish, step_over_calls,
stop_step, step_multi, stop_signal and stop_bpstat parameters.
(load_infrun_state): Add continuations,
intermediate_continuations, proceed_to_finish, step_over_calls,
stop_step, step_multi, stop_signal and stop_bpstat parameters.
* thread.c (load_infrun_state): In non-stop mode, load
continuations, intermediate_continuations, proceed_to_finish,
step_over_calls, stop_step, step_multi and stop_signal.
(save_infrun_state): Store continuations,
intermediate_continuations, proceed_to_finish, step_over_calls,
stop_step, step_multi, stop_signal and stop_bpstat.
(save_infrun_state): Store continuations,
intermediate_continuations, proceed_to_finish, step_over_calls,
stop_step, step_multi, stop_signal and stop_bpstat.
(free_thread): Clear The thread's stop_bpstat.
* inferior.h (context_switch_to): Declare.
* infrun.c (ecss): New global.
(context_switch): Context switch continuations,
intermediate_continuations, proceed_to_finish, step_over_calls,
stop_step, step_multi, stop_signal and stop_bpstat.
(wait_for_inferior): Use global ecss.
(async_ecss, async_ecs): Delete.
(fetch_inferior_event): Use global ecss.
(context_switch_to): New.
* top.c (execute_command): In non-stop, only check if the current
thread is running, in all-stop, check if there's any thread
running.
* breakpoint.c (bpstat_remove_breakpoint): New.
(bpstat_remove_breakpoint_callback): New.
(delete_breakpoint): Clear the stop_bpstats of all threads.
* mi/mi-main.c (mi_cmd_execute): In non-stop, only check if the
current thread is running, in all-stop, check if there's any
thread running.
* Makefile.in (gdbthread_h): Depend on $(inferior_h).
2008-07-10 06:30:46 +08:00
|
|
|
|
ecs->ptid =
|
2009-05-21 23:48:42 +08:00
|
|
|
|
deprecated_target_wait_hook (waiton_ptid, &ecs->ws, TARGET_WNOHANG);
|
1999-07-06 01:58:44 +08:00
|
|
|
|
else
|
2009-05-21 23:48:42 +08:00
|
|
|
|
ecs->ptid = target_wait (waiton_ptid, &ecs->ws, TARGET_WNOHANG);
|
1999-07-06 01:58:44 +08:00
|
|
|
|
|
2009-02-02 07:31:03 +08:00
|
|
|
|
if (debug_infrun)
|
2009-03-02 07:18:36 +08:00
|
|
|
|
print_target_wait_results (waiton_ptid, ecs->ptid, &ecs->ws);
|
2009-02-02 07:31:03 +08:00
|
|
|
|
|
Non-stop inferior control.
* infrun.c (resume): In non-stop mode, always resume just one
thread.
(proceed): Don't call prepare_to_proceed in non-stop mode.
(fetch_inferior_event): In non-stop mode, switch context before
handling the event.
(error_is_running, ensure_not_running): New.
(handle_inferior_event): In non-stop mode: Mark only the event
thread as stopped. Require that the target module manages adding
threads to the thread list. Assert that there isn't a
deferred_step_ptid set. Don't switch to infwait_thread_hop_state.
(normal_stop): Only mark not-running if inferior hasn't exited.
In non-stop mode, only mark the event thread.
* thread.c:Include "cli/cli-decode.h".
(print_thread_info): Don't read from a running thread.
Output "(running)" if thread is running.
(switch_to_thread): Don't read stop_pc if thread is executing.
(do_restore_current_thread_cleanup): Don't write to a running
thread.
(thread_apply_all_command): Don't read from a running thread. In
non-stop mode, do a full context-switch instead of just switching
threads.
(thread_apply_command): In non-stop mode, do a full context-switch
instead of just switching threads.
(do_captured_thread_select): Likewise. Inform user if selected
thread is running.
(_initialize_thread): Mark "info threads" and "thread" and
async_ok.
* inf-loop.c (inferior_event_handler): In non-stop mode, don't
unregister the target from the event loop.
* infcmd.c (continue_command, step_1, jump_command)
(signal_command): Ensure the selected thread isn't running.
(interrupt_target_command): In non-stop mode, interrupt only the
selected thread.
* inferior.h (error_is_running, ensure_not_running): Declare.
* target.h (struct target_ops): Add ptid argument to the to_stop
member.
(target_stop): Add ptid_t argument.
* target.c (update_current_target): Add ptid argument to to_stop's
type.
(debug_to_stop): Add ptid_t argument.
(debug_to_rcmd): Set to_stop_ptid.
* remote.c (remote_stop): Add ptid_t argument.
(async_remote_interrupt): Add inferior_ptid to target_stop.
* inf-ptrace.c (inf_ptrace_stop): Add ptid argument.
* Makefile.in (thread.o): Depend on $(cli_decode_h).
2008-07-10 06:42:43 +08:00
|
|
|
|
if (non_stop
|
|
|
|
|
&& ecs->ws.kind != TARGET_WAITKIND_IGNORE
|
|
|
|
|
&& ecs->ws.kind != TARGET_WAITKIND_EXITED
|
|
|
|
|
&& ecs->ws.kind != TARGET_WAITKIND_SIGNALLED)
|
|
|
|
|
/* In non-stop mode, each thread is handled individually. Switch
|
|
|
|
|
early, so the global state is set correctly for this
|
|
|
|
|
thread. */
|
|
|
|
|
context_switch (ecs->ptid);
|
|
|
|
|
|
2009-01-19 01:42:16 +08:00
|
|
|
|
/* If an error happens while handling the event, propagate GDB's
|
|
|
|
|
knowledge of the executing state to the frontend/user running
|
|
|
|
|
state. */
|
|
|
|
|
if (!non_stop)
|
|
|
|
|
ts_old_chain = make_cleanup (finish_thread_state_cleanup, &minus_one_ptid);
|
|
|
|
|
else
|
|
|
|
|
ts_old_chain = make_cleanup (finish_thread_state_cleanup, &ecs->ptid);
|
|
|
|
|
|
1999-07-06 01:58:44 +08:00
|
|
|
|
/* Now figure out what to do with the result of the result. */
|
Per-thread commands.
* gdbthread.h: Remove unneeded forward declarations.
Include "inferior.h".
(struct thread_info): Add continuations,
intermediate_continuations, proceed_to_finish, step_over_calls,
stop_step, step_multi and stop_signal members.
(save_infrun_state): Add continuations,
intermediate_continuations, proceed_to_finish, step_over_calls,
stop_step, step_multi, stop_signal and stop_bpstat parameters.
(load_infrun_state): Add continuations,
intermediate_continuations, proceed_to_finish, step_over_calls,
stop_step, step_multi, stop_signal and stop_bpstat parameters.
* thread.c (load_infrun_state): In non-stop mode, load
continuations, intermediate_continuations, proceed_to_finish,
step_over_calls, stop_step, step_multi and stop_signal.
(save_infrun_state): Store continuations,
intermediate_continuations, proceed_to_finish, step_over_calls,
stop_step, step_multi, stop_signal and stop_bpstat.
(save_infrun_state): Store continuations,
intermediate_continuations, proceed_to_finish, step_over_calls,
stop_step, step_multi, stop_signal and stop_bpstat.
(free_thread): Clear The thread's stop_bpstat.
* inferior.h (context_switch_to): Declare.
* infrun.c (ecss): New global.
(context_switch): Context switch continuations,
intermediate_continuations, proceed_to_finish, step_over_calls,
stop_step, step_multi, stop_signal and stop_bpstat.
(wait_for_inferior): Use global ecss.
(async_ecss, async_ecs): Delete.
(fetch_inferior_event): Use global ecss.
(context_switch_to): New.
* top.c (execute_command): In non-stop, only check if the current
thread is running, in all-stop, check if there's any thread
running.
* breakpoint.c (bpstat_remove_breakpoint): New.
(bpstat_remove_breakpoint_callback): New.
(delete_breakpoint): Clear the stop_bpstats of all threads.
* mi/mi-main.c (mi_cmd_execute): In non-stop, only check if the
current thread is running, in all-stop, check if there's any
thread running.
* Makefile.in (gdbthread_h): Depend on $(inferior_h).
2008-07-10 06:30:46 +08:00
|
|
|
|
handle_inferior_event (ecs);
|
1999-07-06 01:58:44 +08:00
|
|
|
|
|
Per-thread commands.
* gdbthread.h: Remove unneeded forward declarations.
Include "inferior.h".
(struct thread_info): Add continuations,
intermediate_continuations, proceed_to_finish, step_over_calls,
stop_step, step_multi and stop_signal members.
(save_infrun_state): Add continuations,
intermediate_continuations, proceed_to_finish, step_over_calls,
stop_step, step_multi, stop_signal and stop_bpstat parameters.
(load_infrun_state): Add continuations,
intermediate_continuations, proceed_to_finish, step_over_calls,
stop_step, step_multi, stop_signal and stop_bpstat parameters.
* thread.c (load_infrun_state): In non-stop mode, load
continuations, intermediate_continuations, proceed_to_finish,
step_over_calls, stop_step, step_multi and stop_signal.
(save_infrun_state): Store continuations,
intermediate_continuations, proceed_to_finish, step_over_calls,
stop_step, step_multi, stop_signal and stop_bpstat.
(save_infrun_state): Store continuations,
intermediate_continuations, proceed_to_finish, step_over_calls,
stop_step, step_multi, stop_signal and stop_bpstat.
(free_thread): Clear The thread's stop_bpstat.
* inferior.h (context_switch_to): Declare.
* infrun.c (ecss): New global.
(context_switch): Context switch continuations,
intermediate_continuations, proceed_to_finish, step_over_calls,
stop_step, step_multi, stop_signal and stop_bpstat.
(wait_for_inferior): Use global ecss.
(async_ecss, async_ecs): Delete.
(fetch_inferior_event): Use global ecss.
(context_switch_to): New.
* top.c (execute_command): In non-stop, only check if the current
thread is running, in all-stop, check if there's any thread
running.
* breakpoint.c (bpstat_remove_breakpoint): New.
(bpstat_remove_breakpoint_callback): New.
(delete_breakpoint): Clear the stop_bpstats of all threads.
* mi/mi-main.c (mi_cmd_execute): In non-stop, only check if the
current thread is running, in all-stop, check if there's any
thread running.
* Makefile.in (gdbthread_h): Depend on $(inferior_h).
2008-07-10 06:30:46 +08:00
|
|
|
|
if (!ecs->wait_some_more)
|
1999-07-06 01:58:44 +08:00
|
|
|
|
{
|
2008-09-22 23:20:08 +08:00
|
|
|
|
struct inferior *inf = find_inferior_pid (ptid_get_pid (ecs->ptid));
|
|
|
|
|
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
delete_step_thread_step_resume_breakpoint ();
|
2008-04-24 19:13:44 +08:00
|
|
|
|
|
2008-09-22 23:20:08 +08:00
|
|
|
|
/* We may not find an inferior if this was a process exit. */
|
|
|
|
|
if (inf == NULL || inf->stop_soon == NO_STOP_QUIETLY)
|
2008-08-16 09:04:16 +08:00
|
|
|
|
normal_stop ();
|
|
|
|
|
|
2008-09-09 05:52:25 +08:00
|
|
|
|
if (target_has_execution
|
|
|
|
|
&& ecs->ws.kind != TARGET_WAITKIND_EXITED
|
|
|
|
|
&& ecs->ws.kind != TARGET_WAITKIND_SIGNALLED
|
|
|
|
|
&& ecs->event_thread->step_multi
|
2008-09-09 05:55:16 +08:00
|
|
|
|
&& ecs->event_thread->stop_step)
|
1999-12-07 11:56:43 +08:00
|
|
|
|
inferior_event_handler (INF_EXEC_CONTINUE, NULL);
|
|
|
|
|
else
|
|
|
|
|
inferior_event_handler (INF_EXEC_COMPLETE, NULL);
|
1999-07-06 01:58:44 +08:00
|
|
|
|
}
|
Exited threads.
* thread.c (enum thread_state): New.
(thread_state main_thread_running): Delete, in favor of...
(thread_state main_thread_state): ... this. Update throughout.
(clear_thread_inferior_resources): New, split from free_thread.
(free_thread): Call clear_thread_inferior_resources.
(init_thread_list): Set main thread to stopped state.
(add_thread_silent): Take care of PTID reuses.
(delete_thread): If deleting inferior_ptid or a thread with
refcount > 0, mark it as exited, but still keep it in the list.
Only notify of thread exits, if we haven't done so yet.
(iterate_over_threads): Make it safe to delete threads while
iterating over them.
(do_captured_list_thread_ids): Don't account for exited threads.
(thread_alive): Check for the THREAD_EXITED state, and don't set
ptid to -1 on exited threads.
(set_running): Update to account for extra possible states.
(is_thread_state): New.
(is_stopped, is_exited): New.
(is_running): Implement in terms of is_thread_state.
(any_running): Update.
(print_thread_info): Update. Account for exited threads. Don't
warn about missed frame restoring here, its done in the cleanup.
(switch_to_thread): Don't read from a thread that has gone.
(restore_current_thread): In non-stop mode, do a full context
switch.
(restore_selected_frame): Add a frame_level argument. Rewrite.
(struct current_thread_cleanup): Add selected_frame_level and
was_stopped members.
(do_restore_current_thread_cleanup): Check if thread was stopped
and still is, and if the target has registers, stack and memory
before restoring the selected frame. Don't delete the cleanup
argument here.
(restore_current_thread_cleanup_dtor): New.
(make_cleanup_restore_current_thread): Remove all arguments.
Rewrite.
(thread_apply_all_command): Update. Prune threads.
(thread_apply_command): Update.
(thread_command): Account for currently selected exited thread.
(do_captured_thread_select): Check for a running thread. Prune
threads.
(_initialize_thread): Make "info threads", "thread", "thread
apply", and "thread apply all" appliable without a selected thread.
* gdbthread.h (struct thread_info): Replace running_ by state_.
Add refcount.
(is_exited, is_stopped): Declare.
(make_cleanup_restore_current_thread): Remove all arguments.
* infrun.c: Include "event-top.h".
(fetch_inferior_event): In non-stop mode, restore selected thread
and frame after handling the event and running breakpoint
commands. Display GDB prompt if needed.
(normal_stop): In non-stop mode, don't print thread switching
notice.
* cli/cli-decode.c (set_cmd_no_selected_thread_ok)
(get_cmd_no_selected_thread_ok): New.
* cli/cli-decode.h (CMD_NO_SELECTED_THREAD_OK): New.
(set_cmd_no_selected_thread_ok, get_cmd_no_selected_thread_ok):
Declare.
* cli/cli-cmds.c: Set "pwd", "help", "info", "show" as
no-selected-thread ok.
* top.c (execute_command): Check for non no-selected-thread-ok
commands.
* linux-nat.c (struct saved_ptids, threads_to_delete)
(record_dead_thread, prune_lwps): Delete.
(exit_lwp): Unconditionally delete thread.
(linux_nat_resume): Remove prune_lwps call.
* infcmd.c (proceed_thread_callback): Check if !is_stopped instead
of is_running. Adjust to make_cleanup_restore_current_thread
interface change.
* mi/mi-main.c (mi_cmd_execute): Only allow a few commands if the
selected thread has exited.
* inf-loop.c (inferior_event_handler): Don't display the prompt
here.
* varobj.c (c_value_of_root): Update.
* defs.h (make_cleanup_dtor): Declare.
* utils.c (make_cleanup_dtor): New.
* Makefile.in (infrun.o): Depend on $(event_top_h).
2008-07-11 19:07:39 +08:00
|
|
|
|
|
2009-01-19 01:42:16 +08:00
|
|
|
|
/* No error, don't finish the thread states yet. */
|
|
|
|
|
discard_cleanups (ts_old_chain);
|
|
|
|
|
|
Exited threads.
* thread.c (enum thread_state): New.
(thread_state main_thread_running): Delete, in favor of...
(thread_state main_thread_state): ... this. Update throughout.
(clear_thread_inferior_resources): New, split from free_thread.
(free_thread): Call clear_thread_inferior_resources.
(init_thread_list): Set main thread to stopped state.
(add_thread_silent): Take care of PTID reuses.
(delete_thread): If deleting inferior_ptid or a thread with
refcount > 0, mark it as exited, but still keep it in the list.
Only notify of thread exits, if we haven't done so yet.
(iterate_over_threads): Make it safe to delete threads while
iterating over them.
(do_captured_list_thread_ids): Don't account for exited threads.
(thread_alive): Check for the THREAD_EXITED state, and don't set
ptid to -1 on exited threads.
(set_running): Update to account for extra possible states.
(is_thread_state): New.
(is_stopped, is_exited): New.
(is_running): Implement in terms of is_thread_state.
(any_running): Update.
(print_thread_info): Update. Account for exited threads. Don't
warn about missed frame restoring here, its done in the cleanup.
(switch_to_thread): Don't read from a thread that has gone.
(restore_current_thread): In non-stop mode, do a full context
switch.
(restore_selected_frame): Add a frame_level argument. Rewrite.
(struct current_thread_cleanup): Add selected_frame_level and
was_stopped members.
(do_restore_current_thread_cleanup): Check if thread was stopped
and still is, and if the target has registers, stack and memory
before restoring the selected frame. Don't delete the cleanup
argument here.
(restore_current_thread_cleanup_dtor): New.
(make_cleanup_restore_current_thread): Remove all arguments.
Rewrite.
(thread_apply_all_command): Update. Prune threads.
(thread_apply_command): Update.
(thread_command): Account for currently selected exited thread.
(do_captured_thread_select): Check for a running thread. Prune
threads.
(_initialize_thread): Make "info threads", "thread", "thread
apply", and "thread apply all" appliable without a selected thread.
* gdbthread.h (struct thread_info): Replace running_ by state_.
Add refcount.
(is_exited, is_stopped): Declare.
(make_cleanup_restore_current_thread): Remove all arguments.
* infrun.c: Include "event-top.h".
(fetch_inferior_event): In non-stop mode, restore selected thread
and frame after handling the event and running breakpoint
commands. Display GDB prompt if needed.
(normal_stop): In non-stop mode, don't print thread switching
notice.
* cli/cli-decode.c (set_cmd_no_selected_thread_ok)
(get_cmd_no_selected_thread_ok): New.
* cli/cli-decode.h (CMD_NO_SELECTED_THREAD_OK): New.
(set_cmd_no_selected_thread_ok, get_cmd_no_selected_thread_ok):
Declare.
* cli/cli-cmds.c: Set "pwd", "help", "info", "show" as
no-selected-thread ok.
* top.c (execute_command): Check for non no-selected-thread-ok
commands.
* linux-nat.c (struct saved_ptids, threads_to_delete)
(record_dead_thread, prune_lwps): Delete.
(exit_lwp): Unconditionally delete thread.
(linux_nat_resume): Remove prune_lwps call.
* infcmd.c (proceed_thread_callback): Check if !is_stopped instead
of is_running. Adjust to make_cleanup_restore_current_thread
interface change.
* mi/mi-main.c (mi_cmd_execute): Only allow a few commands if the
selected thread has exited.
* inf-loop.c (inferior_event_handler): Don't display the prompt
here.
* varobj.c (c_value_of_root): Update.
* defs.h (make_cleanup_dtor): Declare.
* utils.c (make_cleanup_dtor): New.
* Makefile.in (infrun.o): Depend on $(event_top_h).
2008-07-11 19:07:39 +08:00
|
|
|
|
/* Revert thread and frame. */
|
|
|
|
|
do_cleanups (old_chain);
|
|
|
|
|
|
|
|
|
|
/* If the inferior was in sync execution mode, and now isn't,
|
|
|
|
|
restore the prompt. */
|
|
|
|
|
if (was_sync && !sync_execution)
|
|
|
|
|
display_gdb_prompt (0);
|
1999-07-06 01:58:44 +08:00
|
|
|
|
}
|
|
|
|
|
|
1999-05-11 21:35:55 +08:00
|
|
|
|
/* Prepare an execution control state for looping through a
|
|
|
|
|
wait_for_inferior-type loop. */
|
|
|
|
|
|
|
|
|
|
void
|
1999-08-10 05:36:23 +08:00
|
|
|
|
init_execution_control_state (struct execution_control_state *ecs)
|
1999-05-11 21:35:55 +08:00
|
|
|
|
{
|
|
|
|
|
ecs->random_signal = 0;
|
Refactor infrun a bit.
* infrun.c (currently_stepping): Take a struct
thread_stepping_state instead of an execution_control_state.
(struct thread_stepping_state): New, split from
execution_control_state.
(gtss, tss): New globals.
(proceed): Clear the stepping state, set previous_inferior_ptid
and clear infwait state.
(init_wait_for_inferior): Clear the stepping state,
previous_inferior_ptid and infwait state.
(waiton_ptid, infwait_state): New, split from
execution_control_state.
(struct execution_control_state): Members that persist through
events moved out to either struct thred_stepping_state or made
global. Deleted unneeded wp, saved_inferior_ptid, tmpstatus.
(wait_for_inferior, fetch_inferior_event): Use local
execution_control_state. Update to execution_control_state split.
(init_execution_control_state): Adjust.
(init_thread_stepping_state): New, extracted from
init_execution_control_state.
(context_switch): Take a ptid instead of an
execution_control_state.
(context_switch_to): Adjust.
(adjust_pc_after_break): Adjust.
(init_infwait_state): New.
(handle_inferior_event): Adjust.
2008-07-10 06:33:16 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Clear context switchable stepping state. */
|
|
|
|
|
|
|
|
|
|
void
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
init_thread_stepping_state (struct thread_info *tss)
|
Refactor infrun a bit.
* infrun.c (currently_stepping): Take a struct
thread_stepping_state instead of an execution_control_state.
(struct thread_stepping_state): New, split from
execution_control_state.
(gtss, tss): New globals.
(proceed): Clear the stepping state, set previous_inferior_ptid
and clear infwait state.
(init_wait_for_inferior): Clear the stepping state,
previous_inferior_ptid and infwait state.
(waiton_ptid, infwait_state): New, split from
execution_control_state.
(struct execution_control_state): Members that persist through
events moved out to either struct thred_stepping_state or made
global. Deleted unneeded wp, saved_inferior_ptid, tmpstatus.
(wait_for_inferior, fetch_inferior_event): Use local
execution_control_state. Update to execution_control_state split.
(init_execution_control_state): Adjust.
(init_thread_stepping_state): New, extracted from
init_execution_control_state.
(context_switch): Take a ptid instead of an
execution_control_state.
(context_switch_to): Adjust.
(adjust_pc_after_break): Adjust.
(init_infwait_state): New.
(handle_inferior_event): Adjust.
2008-07-10 06:33:16 +08:00
|
|
|
|
{
|
2008-07-13 02:39:10 +08:00
|
|
|
|
struct symtab_and_line sal;
|
|
|
|
|
|
Refactor infrun a bit.
* infrun.c (currently_stepping): Take a struct
thread_stepping_state instead of an execution_control_state.
(struct thread_stepping_state): New, split from
execution_control_state.
(gtss, tss): New globals.
(proceed): Clear the stepping state, set previous_inferior_ptid
and clear infwait state.
(init_wait_for_inferior): Clear the stepping state,
previous_inferior_ptid and infwait state.
(waiton_ptid, infwait_state): New, split from
execution_control_state.
(struct execution_control_state): Members that persist through
events moved out to either struct thred_stepping_state or made
global. Deleted unneeded wp, saved_inferior_ptid, tmpstatus.
(wait_for_inferior, fetch_inferior_event): Use local
execution_control_state. Update to execution_control_state split.
(init_execution_control_state): Adjust.
(init_thread_stepping_state): New, extracted from
init_execution_control_state.
(context_switch): Take a ptid instead of an
execution_control_state.
(context_switch_to): Adjust.
(adjust_pc_after_break): Adjust.
(init_infwait_state): New.
(handle_inferior_event): Adjust.
2008-07-10 06:33:16 +08:00
|
|
|
|
tss->stepping_over_breakpoint = 0;
|
|
|
|
|
tss->step_after_step_resume_breakpoint = 0;
|
|
|
|
|
tss->stepping_through_solib_after_catch = 0;
|
|
|
|
|
tss->stepping_through_solib_catchpoints = NULL;
|
2008-07-13 02:39:10 +08:00
|
|
|
|
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
sal = find_pc_line (tss->prev_pc, 0);
|
2008-07-13 02:39:10 +08:00
|
|
|
|
tss->current_line = sal.line;
|
|
|
|
|
tss->current_symtab = sal.symtab;
|
1999-05-11 21:35:55 +08:00
|
|
|
|
}
|
|
|
|
|
|
2001-04-07 01:53:39 +08:00
|
|
|
|
/* Return the cached copy of the last pid/waitstatus returned by
|
2004-04-21 Andrew Cagney <cagney@redhat.com>
* annotate.h (deprecated_annotate_starting_hook)
(deprecated_annotate_stopped_hook)
(deprecated_annotate_exited_hook)
(deprecated_annotate_signal_hook)
(deprecated_annotate_signalled_hook): Deprecate.
* tracepoint.h (deprecated_create_tracepoint_hook)
(deprecated_delete_tracepoint_hook)
(deprecated_modify_tracepoint_hook)
(deprecated_trace_find_hook)
(deprecated_trace_start_stop_hook): Deprecate.
* target.h (deprecated_target_new_objfile_hook): Deprecate.
* remote.h (deprecated_target_resume_hook)
(deprecated_target_wait_loop_hook): Deprecate.
* gdbcore.h (deprecated_exec_file_display_hook)
(deprecated_file_changed_hook): Deprecate.
* frame.h (deprecated_selected_frame_level_changed_hook): Deprecate.
* defs.h (deprecated_modify_breakpoint_hook)
(deprecated_command_loop_hook, deprecated_show_load_progress)
(deprecated_print_frame_info_listing_hook)
(deprecated_query_hook, deprecated_warning_hook)
(deprecated_flush_hook, deprecated_create_breakpoint_hook)
(deprecated_delete_breakpoint_hook)
(deprecated_interactive_hook, deprecated_registers_changed_hook)
(deprecated_readline_begin_hook, deprecated_readline_hook)
(deprecated_readline_end_hook, deprecated_register_changed_hook)
(deprecated_memory_changed_hook, deprecated_init_ui_hook)
(deprecated_context_hook, deprecated_target_wait_hook)
(deprecated_attach_hook, deprecated_detach_hook)
(deprecated_call_command_hook, deprecated_set_hook)
(deprecated_error_hook, deprecated_error_begin_hook)
(deprecated_ui_load_progress_hook): Deprecate.
* valops.c, uw-thread.c, utils.c, tui/tui-io.c: Update.
* tui/tui-hooks.c, tracepoint.c, top.c, thread-db.c: Update.
* target.c, symfile.c, stack.c, sol-thread.c, rs6000-nat.c: Update.
* remote.c, remote-mips.c, regcache.c, mi/mi-interp.c: Update.
* main.c, interps.c, infcmd.c, hpux-thread.c, frame.c: Update.
* exec.c, dsrec.c, d10v-tdep.c, corefile.c, complaints.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, breakpoint.c: Update.
* annotate.c, aix-thread.c: Update.
2004-04-22 07:52:21 +08:00
|
|
|
|
target_wait()/deprecated_target_wait_hook(). The data is actually
|
|
|
|
|
cached by handle_inferior_event(), which gets called immediately
|
|
|
|
|
after target_wait()/deprecated_target_wait_hook(). */
|
2001-04-07 01:53:39 +08:00
|
|
|
|
|
|
|
|
|
void
|
2002-07-19 01:53:50 +08:00
|
|
|
|
get_last_target_status (ptid_t *ptidp, struct target_waitstatus *status)
|
2001-04-07 01:53:39 +08:00
|
|
|
|
{
|
2001-05-04 12:15:33 +08:00
|
|
|
|
*ptidp = target_last_wait_ptid;
|
2001-04-07 01:53:39 +08:00
|
|
|
|
*status = target_last_waitstatus;
|
|
|
|
|
}
|
|
|
|
|
|
2006-01-05 03:34:58 +08:00
|
|
|
|
void
|
|
|
|
|
nullify_last_target_wait_ptid (void)
|
|
|
|
|
{
|
|
|
|
|
target_last_wait_ptid = minus_one_ptid;
|
|
|
|
|
}
|
|
|
|
|
|
2008-09-09 06:10:20 +08:00
|
|
|
|
/* Switch thread contexts. */
|
2001-06-16 06:44:20 +08:00
|
|
|
|
|
|
|
|
|
static void
|
Refactor infrun a bit.
* infrun.c (currently_stepping): Take a struct
thread_stepping_state instead of an execution_control_state.
(struct thread_stepping_state): New, split from
execution_control_state.
(gtss, tss): New globals.
(proceed): Clear the stepping state, set previous_inferior_ptid
and clear infwait state.
(init_wait_for_inferior): Clear the stepping state,
previous_inferior_ptid and infwait state.
(waiton_ptid, infwait_state): New, split from
execution_control_state.
(struct execution_control_state): Members that persist through
events moved out to either struct thred_stepping_state or made
global. Deleted unneeded wp, saved_inferior_ptid, tmpstatus.
(wait_for_inferior, fetch_inferior_event): Use local
execution_control_state. Update to execution_control_state split.
(init_execution_control_state): Adjust.
(init_thread_stepping_state): New, extracted from
init_execution_control_state.
(context_switch): Take a ptid instead of an
execution_control_state.
(context_switch_to): Adjust.
(adjust_pc_after_break): Adjust.
(init_infwait_state): New.
(handle_inferior_event): Adjust.
2008-07-10 06:33:16 +08:00
|
|
|
|
context_switch (ptid_t ptid)
|
2001-06-16 06:44:20 +08:00
|
|
|
|
{
|
2007-01-11 04:10:23 +08:00
|
|
|
|
if (debug_infrun)
|
|
|
|
|
{
|
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: Switching context from %s ",
|
|
|
|
|
target_pid_to_str (inferior_ptid));
|
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "to %s\n",
|
Refactor infrun a bit.
* infrun.c (currently_stepping): Take a struct
thread_stepping_state instead of an execution_control_state.
(struct thread_stepping_state): New, split from
execution_control_state.
(gtss, tss): New globals.
(proceed): Clear the stepping state, set previous_inferior_ptid
and clear infwait state.
(init_wait_for_inferior): Clear the stepping state,
previous_inferior_ptid and infwait state.
(waiton_ptid, infwait_state): New, split from
execution_control_state.
(struct execution_control_state): Members that persist through
events moved out to either struct thred_stepping_state or made
global. Deleted unneeded wp, saved_inferior_ptid, tmpstatus.
(wait_for_inferior, fetch_inferior_event): Use local
execution_control_state. Update to execution_control_state split.
(init_execution_control_state): Adjust.
(init_thread_stepping_state): New, extracted from
init_execution_control_state.
(context_switch): Take a ptid instead of an
execution_control_state.
(context_switch_to): Adjust.
(adjust_pc_after_break): Adjust.
(init_infwait_state): New.
(handle_inferior_event): Adjust.
2008-07-10 06:33:16 +08:00
|
|
|
|
target_pid_to_str (ptid));
|
2007-01-11 04:10:23 +08:00
|
|
|
|
}
|
|
|
|
|
|
Refactor infrun a bit.
* infrun.c (currently_stepping): Take a struct
thread_stepping_state instead of an execution_control_state.
(struct thread_stepping_state): New, split from
execution_control_state.
(gtss, tss): New globals.
(proceed): Clear the stepping state, set previous_inferior_ptid
and clear infwait state.
(init_wait_for_inferior): Clear the stepping state,
previous_inferior_ptid and infwait state.
(waiton_ptid, infwait_state): New, split from
execution_control_state.
(struct execution_control_state): Members that persist through
events moved out to either struct thred_stepping_state or made
global. Deleted unneeded wp, saved_inferior_ptid, tmpstatus.
(wait_for_inferior, fetch_inferior_event): Use local
execution_control_state. Update to execution_control_state split.
(init_execution_control_state): Adjust.
(init_thread_stepping_state): New, extracted from
init_execution_control_state.
(context_switch): Take a ptid instead of an
execution_control_state.
(context_switch_to): Adjust.
(adjust_pc_after_break): Adjust.
(init_infwait_state): New.
(handle_inferior_event): Adjust.
2008-07-10 06:33:16 +08:00
|
|
|
|
switch_to_thread (ptid);
|
2001-06-16 06:44:20 +08:00
|
|
|
|
}
|
|
|
|
|
|
2004-02-01 03:18:13 +08:00
|
|
|
|
static void
|
|
|
|
|
adjust_pc_after_break (struct execution_control_state *ecs)
|
|
|
|
|
{
|
2008-08-22 22:47:13 +08:00
|
|
|
|
struct regcache *regcache;
|
|
|
|
|
struct gdbarch *gdbarch;
|
2004-05-13 02:08:38 +08:00
|
|
|
|
CORE_ADDR breakpoint_pc;
|
2004-02-01 03:18:13 +08:00
|
|
|
|
|
|
|
|
|
/* If we've hit a breakpoint, we'll normally be stopped with SIGTRAP. If
|
|
|
|
|
we aren't, just return.
|
2004-02-01 03:59:06 +08:00
|
|
|
|
|
|
|
|
|
We assume that waitkinds other than TARGET_WAITKIND_STOPPED are not
|
2007-06-09 21:55:51 +08:00
|
|
|
|
affected by gdbarch_decr_pc_after_break. Other waitkinds which are
|
|
|
|
|
implemented by software breakpoints should be handled through the normal
|
|
|
|
|
breakpoint layer.
|
2004-08-25 22:47:07 +08:00
|
|
|
|
|
2004-02-01 03:18:13 +08:00
|
|
|
|
NOTE drow/2004-01-31: On some targets, breakpoints may generate
|
|
|
|
|
different signals (SIGILL or SIGEMT for instance), but it is less
|
|
|
|
|
clear where the PC is pointing afterwards. It may not match
|
2007-06-09 21:55:51 +08:00
|
|
|
|
gdbarch_decr_pc_after_break. I don't know any specific target that
|
|
|
|
|
generates these signals at breakpoints (the code has been in GDB since at
|
|
|
|
|
least 1992) so I can not guess how to handle them here.
|
2004-08-25 22:47:07 +08:00
|
|
|
|
|
2007-06-06 23:38:56 +08:00
|
|
|
|
In earlier versions of GDB, a target with
|
|
|
|
|
gdbarch_have_nonsteppable_watchpoint would have the PC after hitting a
|
2007-06-09 21:55:51 +08:00
|
|
|
|
watchpoint affected by gdbarch_decr_pc_after_break. I haven't found any
|
|
|
|
|
target with both of these set in GDB history, and it seems unlikely to be
|
|
|
|
|
correct, so gdbarch_have_nonsteppable_watchpoint is not checked here. */
|
2004-02-01 03:18:13 +08:00
|
|
|
|
|
|
|
|
|
if (ecs->ws.kind != TARGET_WAITKIND_STOPPED)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
if (ecs->ws.value.sig != TARGET_SIGNAL_TRAP)
|
|
|
|
|
return;
|
|
|
|
|
|
2008-10-18 11:24:34 +08:00
|
|
|
|
/* In reverse execution, when a breakpoint is hit, the instruction
|
|
|
|
|
under it has already been de-executed. The reported PC always
|
|
|
|
|
points at the breakpoint address, so adjusting it further would
|
|
|
|
|
be wrong. E.g., consider this case on a decr_pc_after_break == 1
|
|
|
|
|
architecture:
|
|
|
|
|
|
|
|
|
|
B1 0x08000000 : INSN1
|
|
|
|
|
B2 0x08000001 : INSN2
|
|
|
|
|
0x08000002 : INSN3
|
|
|
|
|
PC -> 0x08000003 : INSN4
|
|
|
|
|
|
|
|
|
|
Say you're stopped at 0x08000003 as above. Reverse continuing
|
|
|
|
|
from that point should hit B2 as below. Reading the PC when the
|
|
|
|
|
SIGTRAP is reported should read 0x08000001 and INSN2 should have
|
|
|
|
|
been de-executed already.
|
|
|
|
|
|
|
|
|
|
B1 0x08000000 : INSN1
|
|
|
|
|
B2 PC -> 0x08000001 : INSN2
|
|
|
|
|
0x08000002 : INSN3
|
|
|
|
|
0x08000003 : INSN4
|
|
|
|
|
|
|
|
|
|
We can't apply the same logic as for forward execution, because
|
|
|
|
|
we would wrongly adjust the PC to 0x08000000, since there's a
|
|
|
|
|
breakpoint at PC - 1. We'd then report a hit on B1, although
|
|
|
|
|
INSN1 hadn't been de-executed yet. Doing nothing is the correct
|
|
|
|
|
behaviour. */
|
|
|
|
|
if (execution_direction == EXEC_REVERSE)
|
|
|
|
|
return;
|
|
|
|
|
|
2008-08-22 22:47:13 +08:00
|
|
|
|
/* If this target does not decrement the PC after breakpoints, then
|
|
|
|
|
we have nothing to do. */
|
|
|
|
|
regcache = get_thread_regcache (ecs->ptid);
|
|
|
|
|
gdbarch = get_regcache_arch (regcache);
|
|
|
|
|
if (gdbarch_decr_pc_after_break (gdbarch) == 0)
|
|
|
|
|
return;
|
|
|
|
|
|
2004-05-13 02:08:38 +08:00
|
|
|
|
/* Find the location where (if we've hit a breakpoint) the
|
|
|
|
|
breakpoint would be. */
|
2008-05-04 22:12:34 +08:00
|
|
|
|
breakpoint_pc = regcache_read_pc (regcache)
|
|
|
|
|
- gdbarch_decr_pc_after_break (gdbarch);
|
2004-05-13 02:08:38 +08:00
|
|
|
|
|
2008-10-16 03:15:34 +08:00
|
|
|
|
/* Check whether there actually is a software breakpoint inserted at
|
|
|
|
|
that location.
|
|
|
|
|
|
|
|
|
|
If in non-stop mode, a race condition is possible where we've
|
|
|
|
|
removed a breakpoint, but stop events for that breakpoint were
|
|
|
|
|
already queued and arrive later. To suppress those spurious
|
|
|
|
|
SIGTRAPs, we keep a list of such breakpoint locations for a bit,
|
|
|
|
|
and retire them after a number of stop events are reported. */
|
|
|
|
|
if (software_breakpoint_inserted_here_p (breakpoint_pc)
|
|
|
|
|
|| (non_stop && moribund_breakpoint_here_p (breakpoint_pc)))
|
2004-05-13 02:08:38 +08:00
|
|
|
|
{
|
2009-04-30 11:09:59 +08:00
|
|
|
|
struct cleanup *old_cleanups = NULL;
|
|
|
|
|
if (RECORD_IS_USED)
|
|
|
|
|
old_cleanups = record_gdb_operation_disable_set ();
|
|
|
|
|
|
2007-06-22 20:47:48 +08:00
|
|
|
|
/* When using hardware single-step, a SIGTRAP is reported for both
|
|
|
|
|
a completed single-step and a software breakpoint. Need to
|
|
|
|
|
differentiate between the two, as the latter needs adjusting
|
|
|
|
|
but the former does not.
|
|
|
|
|
|
|
|
|
|
The SIGTRAP can be due to a completed hardware single-step only if
|
|
|
|
|
- we didn't insert software single-step breakpoints
|
|
|
|
|
- the thread to be examined is still the current thread
|
|
|
|
|
- this thread is currently being stepped
|
|
|
|
|
|
|
|
|
|
If any of these events did not occur, we must have stopped due
|
|
|
|
|
to hitting a software breakpoint, and have to back up to the
|
|
|
|
|
breakpoint address.
|
|
|
|
|
|
|
|
|
|
As a special case, we could have hardware single-stepped a
|
|
|
|
|
software breakpoint. In this case (prev_pc == breakpoint_pc),
|
|
|
|
|
we also need to back up to the breakpoint address. */
|
|
|
|
|
|
|
|
|
|
if (singlestep_breakpoints_inserted_p
|
|
|
|
|
|| !ptid_equal (ecs->ptid, inferior_ptid)
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
|| !currently_stepping (ecs->event_thread)
|
|
|
|
|
|| ecs->event_thread->prev_pc == breakpoint_pc)
|
2008-05-04 22:12:34 +08:00
|
|
|
|
regcache_write_pc (regcache, breakpoint_pc);
|
2009-04-30 11:09:59 +08:00
|
|
|
|
|
|
|
|
|
if (RECORD_IS_USED)
|
|
|
|
|
do_cleanups (old_cleanups);
|
2004-05-13 02:08:38 +08:00
|
|
|
|
}
|
2004-02-01 03:18:13 +08:00
|
|
|
|
}
|
|
|
|
|
|
Refactor infrun a bit.
* infrun.c (currently_stepping): Take a struct
thread_stepping_state instead of an execution_control_state.
(struct thread_stepping_state): New, split from
execution_control_state.
(gtss, tss): New globals.
(proceed): Clear the stepping state, set previous_inferior_ptid
and clear infwait state.
(init_wait_for_inferior): Clear the stepping state,
previous_inferior_ptid and infwait state.
(waiton_ptid, infwait_state): New, split from
execution_control_state.
(struct execution_control_state): Members that persist through
events moved out to either struct thred_stepping_state or made
global. Deleted unneeded wp, saved_inferior_ptid, tmpstatus.
(wait_for_inferior, fetch_inferior_event): Use local
execution_control_state. Update to execution_control_state split.
(init_execution_control_state): Adjust.
(init_thread_stepping_state): New, extracted from
init_execution_control_state.
(context_switch): Take a ptid instead of an
execution_control_state.
(context_switch_to): Adjust.
(adjust_pc_after_break): Adjust.
(init_infwait_state): New.
(handle_inferior_event): Adjust.
2008-07-10 06:33:16 +08:00
|
|
|
|
void
|
|
|
|
|
init_infwait_state (void)
|
|
|
|
|
{
|
|
|
|
|
waiton_ptid = pid_to_ptid (-1);
|
|
|
|
|
infwait_state = infwait_normal_state;
|
|
|
|
|
}
|
|
|
|
|
|
Non-stop inferior control.
* infrun.c (resume): In non-stop mode, always resume just one
thread.
(proceed): Don't call prepare_to_proceed in non-stop mode.
(fetch_inferior_event): In non-stop mode, switch context before
handling the event.
(error_is_running, ensure_not_running): New.
(handle_inferior_event): In non-stop mode: Mark only the event
thread as stopped. Require that the target module manages adding
threads to the thread list. Assert that there isn't a
deferred_step_ptid set. Don't switch to infwait_thread_hop_state.
(normal_stop): Only mark not-running if inferior hasn't exited.
In non-stop mode, only mark the event thread.
* thread.c:Include "cli/cli-decode.h".
(print_thread_info): Don't read from a running thread.
Output "(running)" if thread is running.
(switch_to_thread): Don't read stop_pc if thread is executing.
(do_restore_current_thread_cleanup): Don't write to a running
thread.
(thread_apply_all_command): Don't read from a running thread. In
non-stop mode, do a full context-switch instead of just switching
threads.
(thread_apply_command): In non-stop mode, do a full context-switch
instead of just switching threads.
(do_captured_thread_select): Likewise. Inform user if selected
thread is running.
(_initialize_thread): Mark "info threads" and "thread" and
async_ok.
* inf-loop.c (inferior_event_handler): In non-stop mode, don't
unregister the target from the event loop.
* infcmd.c (continue_command, step_1, jump_command)
(signal_command): Ensure the selected thread isn't running.
(interrupt_target_command): In non-stop mode, interrupt only the
selected thread.
* inferior.h (error_is_running, ensure_not_running): Declare.
* target.h (struct target_ops): Add ptid argument to the to_stop
member.
(target_stop): Add ptid_t argument.
* target.c (update_current_target): Add ptid argument to to_stop's
type.
(debug_to_stop): Add ptid_t argument.
(debug_to_rcmd): Set to_stop_ptid.
* remote.c (remote_stop): Add ptid_t argument.
(async_remote_interrupt): Add inferior_ptid to target_stop.
* inf-ptrace.c (inf_ptrace_stop): Add ptid argument.
* Makefile.in (thread.o): Depend on $(cli_decode_h).
2008-07-10 06:42:43 +08:00
|
|
|
|
void
|
|
|
|
|
error_is_running (void)
|
|
|
|
|
{
|
|
|
|
|
error (_("\
|
|
|
|
|
Cannot execute this command while the selected thread is running."));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
ensure_not_running (void)
|
|
|
|
|
{
|
|
|
|
|
if (is_running (inferior_ptid))
|
|
|
|
|
error_is_running ();
|
|
|
|
|
}
|
|
|
|
|
|
1999-05-11 21:35:55 +08:00
|
|
|
|
/* Given an execution control state that has been freshly filled in
|
|
|
|
|
by an event from the inferior, figure out what it means and take
|
|
|
|
|
appropriate action. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
1999-05-11 21:35:55 +08:00
|
|
|
|
void
|
1999-08-10 05:36:23 +08:00
|
|
|
|
handle_inferior_event (struct execution_control_state *ecs)
|
1999-05-11 21:35:55 +08:00
|
|
|
|
{
|
2002-08-17 14:12:52 +08:00
|
|
|
|
int sw_single_step_trap_p = 0;
|
2007-10-01 08:17:58 +08:00
|
|
|
|
int stopped_by_watchpoint;
|
|
|
|
|
int stepped_after_stopped_by_watchpoint = 0;
|
2008-07-13 02:39:10 +08:00
|
|
|
|
struct symtab_and_line stop_pc_sal;
|
2008-09-22 23:20:08 +08:00
|
|
|
|
enum stop_kind stop_soon;
|
|
|
|
|
|
|
|
|
|
if (ecs->ws.kind != TARGET_WAITKIND_EXITED
|
|
|
|
|
&& ecs->ws.kind != TARGET_WAITKIND_SIGNALLED
|
|
|
|
|
&& ecs->ws.kind != TARGET_WAITKIND_IGNORE)
|
|
|
|
|
{
|
|
|
|
|
struct inferior *inf = find_inferior_pid (ptid_get_pid (ecs->ptid));
|
|
|
|
|
gdb_assert (inf);
|
|
|
|
|
stop_soon = inf->stop_soon;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
stop_soon = NO_STOP_QUIETLY;
|
1999-05-11 21:35:55 +08:00
|
|
|
|
|
2001-04-07 01:53:39 +08:00
|
|
|
|
/* Cache the last pid/waitstatus. */
|
2001-05-04 12:15:33 +08:00
|
|
|
|
target_last_wait_ptid = ecs->ptid;
|
Refactor infrun a bit.
* infrun.c (currently_stepping): Take a struct
thread_stepping_state instead of an execution_control_state.
(struct thread_stepping_state): New, split from
execution_control_state.
(gtss, tss): New globals.
(proceed): Clear the stepping state, set previous_inferior_ptid
and clear infwait state.
(init_wait_for_inferior): Clear the stepping state,
previous_inferior_ptid and infwait state.
(waiton_ptid, infwait_state): New, split from
execution_control_state.
(struct execution_control_state): Members that persist through
events moved out to either struct thred_stepping_state or made
global. Deleted unneeded wp, saved_inferior_ptid, tmpstatus.
(wait_for_inferior, fetch_inferior_event): Use local
execution_control_state. Update to execution_control_state split.
(init_execution_control_state): Adjust.
(init_thread_stepping_state): New, extracted from
init_execution_control_state.
(context_switch): Take a ptid instead of an
execution_control_state.
(context_switch_to): Adjust.
(adjust_pc_after_break): Adjust.
(init_infwait_state): New.
(handle_inferior_event): Adjust.
2008-07-10 06:33:16 +08:00
|
|
|
|
target_last_waitstatus = ecs->ws;
|
2001-04-07 01:53:39 +08:00
|
|
|
|
|
2007-12-07 08:44:27 +08:00
|
|
|
|
/* Always clear state belonging to the previous time we stopped. */
|
|
|
|
|
stop_stack_dummy = 0;
|
|
|
|
|
|
2008-07-16 01:25:21 +08:00
|
|
|
|
/* If it's a new process, add it to the thread database */
|
|
|
|
|
|
|
|
|
|
ecs->new_thread_event = (!ptid_equal (ecs->ptid, inferior_ptid)
|
|
|
|
|
&& !ptid_equal (ecs->ptid, minus_one_ptid)
|
|
|
|
|
&& !in_thread_list (ecs->ptid));
|
|
|
|
|
|
|
|
|
|
if (ecs->ws.kind != TARGET_WAITKIND_EXITED
|
|
|
|
|
&& ecs->ws.kind != TARGET_WAITKIND_SIGNALLED && ecs->new_thread_event)
|
|
|
|
|
add_thread (ecs->ptid);
|
|
|
|
|
|
2009-05-25 05:06:53 +08:00
|
|
|
|
ecs->event_thread = find_thread_ptid (ecs->ptid);
|
2008-09-18 05:48:49 +08:00
|
|
|
|
|
|
|
|
|
/* Dependent on valid ECS->EVENT_THREAD. */
|
|
|
|
|
adjust_pc_after_break (ecs);
|
|
|
|
|
|
|
|
|
|
/* Dependent on the current PC value modified by adjust_pc_after_break. */
|
|
|
|
|
reinit_frame_cache ();
|
|
|
|
|
|
2008-07-16 01:25:21 +08:00
|
|
|
|
if (ecs->ws.kind != TARGET_WAITKIND_IGNORE)
|
|
|
|
|
{
|
2008-10-16 03:15:34 +08:00
|
|
|
|
breakpoint_retire_moribund ();
|
|
|
|
|
|
2008-12-12 22:20:48 +08:00
|
|
|
|
/* Mark the non-executing threads accordingly. In all-stop, all
|
|
|
|
|
threads of all processes are stopped when we get any event
|
|
|
|
|
reported. In non-stop mode, only the event thread stops. If
|
|
|
|
|
we're handling a process exit in non-stop mode, there's
|
|
|
|
|
nothing to do, as threads of the dead process are gone, and
|
|
|
|
|
threads of any other process were left running. */
|
|
|
|
|
if (!non_stop)
|
|
|
|
|
set_executing (minus_one_ptid, 0);
|
|
|
|
|
else if (ecs->ws.kind != TARGET_WAITKIND_SIGNALLED
|
|
|
|
|
&& ecs->ws.kind != TARGET_WAITKIND_EXITED)
|
|
|
|
|
set_executing (inferior_ptid, 0);
|
2008-07-16 01:25:21 +08:00
|
|
|
|
}
|
|
|
|
|
|
Refactor infrun a bit.
* infrun.c (currently_stepping): Take a struct
thread_stepping_state instead of an execution_control_state.
(struct thread_stepping_state): New, split from
execution_control_state.
(gtss, tss): New globals.
(proceed): Clear the stepping state, set previous_inferior_ptid
and clear infwait state.
(init_wait_for_inferior): Clear the stepping state,
previous_inferior_ptid and infwait state.
(waiton_ptid, infwait_state): New, split from
execution_control_state.
(struct execution_control_state): Members that persist through
events moved out to either struct thred_stepping_state or made
global. Deleted unneeded wp, saved_inferior_ptid, tmpstatus.
(wait_for_inferior, fetch_inferior_event): Use local
execution_control_state. Update to execution_control_state split.
(init_execution_control_state): Adjust.
(init_thread_stepping_state): New, extracted from
init_execution_control_state.
(context_switch): Take a ptid instead of an
execution_control_state.
(context_switch_to): Adjust.
(adjust_pc_after_break): Adjust.
(init_infwait_state): New.
(handle_inferior_event): Adjust.
2008-07-10 06:33:16 +08:00
|
|
|
|
switch (infwait_state)
|
2002-07-19 01:53:50 +08:00
|
|
|
|
{
|
|
|
|
|
case infwait_thread_hop_state:
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2005-01-20 00:09:46 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: infwait_thread_hop_state\n");
|
2002-07-19 01:53:50 +08:00
|
|
|
|
/* Cancel the waiton_ptid. */
|
Refactor infrun a bit.
* infrun.c (currently_stepping): Take a struct
thread_stepping_state instead of an execution_control_state.
(struct thread_stepping_state): New, split from
execution_control_state.
(gtss, tss): New globals.
(proceed): Clear the stepping state, set previous_inferior_ptid
and clear infwait state.
(init_wait_for_inferior): Clear the stepping state,
previous_inferior_ptid and infwait state.
(waiton_ptid, infwait_state): New, split from
execution_control_state.
(struct execution_control_state): Members that persist through
events moved out to either struct thred_stepping_state or made
global. Deleted unneeded wp, saved_inferior_ptid, tmpstatus.
(wait_for_inferior, fetch_inferior_event): Use local
execution_control_state. Update to execution_control_state split.
(init_execution_control_state): Adjust.
(init_thread_stepping_state): New, extracted from
init_execution_control_state.
(context_switch): Take a ptid instead of an
execution_control_state.
(context_switch_to): Adjust.
(adjust_pc_after_break): Adjust.
(init_infwait_state): New.
(handle_inferior_event): Adjust.
2008-07-10 06:33:16 +08:00
|
|
|
|
waiton_ptid = pid_to_ptid (-1);
|
2003-03-30 07:29:47 +08:00
|
|
|
|
break;
|
1999-05-05 22:45:51 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
case infwait_normal_state:
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2005-01-20 00:09:46 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: infwait_normal_state\n");
|
2007-10-01 08:17:58 +08:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case infwait_step_watch_state:
|
|
|
|
|
if (debug_infrun)
|
|
|
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
|
|
|
"infrun: infwait_step_watch_state\n");
|
|
|
|
|
|
|
|
|
|
stepped_after_stopped_by_watchpoint = 1;
|
2002-07-19 01:53:50 +08:00
|
|
|
|
break;
|
1999-05-05 22:45:51 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
case infwait_nonstep_watch_state:
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2005-01-20 00:09:46 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
|
|
|
"infrun: infwait_nonstep_watch_state\n");
|
2002-07-19 01:53:50 +08:00
|
|
|
|
insert_breakpoints ();
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
/* FIXME-maybe: is this cleaner than setting a flag? Does it
|
|
|
|
|
handle things like signals arriving and other things happening
|
|
|
|
|
in combination correctly? */
|
|
|
|
|
stepped_after_stopped_by_watchpoint = 1;
|
|
|
|
|
break;
|
2003-03-30 07:29:47 +08:00
|
|
|
|
|
|
|
|
|
default:
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up error_no_arg, query, perror_with_name, complaint, and
internal_error.
* breakpoint.c, cp-abi.c, cp-namespace.c, cp-support.c: Update.
* cris-tdep.c, dbxread.c, dictionary.c, dsrec.c: Update.
* dummy-frame.c, dve3900-rom.c, dwarf2-frame.c, dwarf2expr.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, event-loop.c: Update.
* exceptions.c, exec.c, f-lang.c, findvar.c, fork-child.c: Update.
* frame-unwind.c, frame.c, frv-linux-tdep.c, frv-tdep.c: Update.
* gdb_assert.h, gdbarch.c, gdbtypes.c, gnu-nat.c: Update.
* go32-nat.c, hppa-tdep.c, hppabsd-nat.c, hpread.c: Update.
* i386-linux-nat.c, i386-nat.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386fbsd-nat.c, inf-ptrace.c, inf-ttrace.c, infcall.c: Update.
* infcmd.c, inflow.c, infptrace.c, infrun.c, inftarg.c: Update.
* interps.c, language.c, linespec.c, linux-nat.c: Update.
* m32r-linux-nat.c, m68k-tdep.c, m68kbsd-nat.c: Update.
* m68klinux-nat.c, m88kbsd-nat.c, macroexp.c, macroscope.c: Update.
* macrotab.c, maint.c, mdebugread.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mips64obsd-nat.c: Update.
* mipsnbsd-nat.c, mn10300-tdep.c, monitor.c, nto-procfs.c: Update.
* objc-lang.c, objfiles.c, objfiles.h, ocd.c, osabi.c: Update.
* parse.c, ppc-bdm.c, ppc-linux-nat.c, ppc-sysv-tdep.c: Update.
* ppcnbsd-nat.c, ppcobsd-nat.c, printcmd.c, procfs.c: Update.
* regcache.c, reggroups.c, remote-e7000.c, remote-mips.c: Update.
* remote-rdp.c, remote-sds.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote.c, rs6000-nat.c, rs6000-tdep.c: Update.
* s390-nat.c, s390-tdep.c, sentinel-frame.c, serial.c: Update.
* sh-tdep.c, sh3-rom.c, sh64-tdep.c, shnbsd-nat.c: Update.
* solib-aix5.c, solib-svr4.c, solib.c, source.c: Update.
* sparc-nat.c, stabsread.c, stack.c, symfile.c, symtab.c: Update.
* symtab.h, target.c, tracepoint.c, ui-file.c, ui-out.c: Update.
* utils.c, valops.c, valprint.c, vax-nat.c, vaxbsd-nat.c: Update.
* win32-nat.c, xcoffread.c, xstormy16-tdep.c: Update.
* cli/cli-cmds.c, cli/cli-logging.c, cli/cli-script.c: Update.
* cli/cli-setshow.c, mi/mi-cmd-break.c, mi/mi-cmds.c: Update.
* mi/mi-console.c, mi/mi-getopt.c, mi/mi-out.c: Update.
* tui/tui-file.c, tui/tui-interp.c: Update.
2005-02-12 02:13:55 +08:00
|
|
|
|
internal_error (__FILE__, __LINE__, _("bad switch"));
|
2002-07-19 01:53:50 +08:00
|
|
|
|
}
|
Refactor infrun a bit.
* infrun.c (currently_stepping): Take a struct
thread_stepping_state instead of an execution_control_state.
(struct thread_stepping_state): New, split from
execution_control_state.
(gtss, tss): New globals.
(proceed): Clear the stepping state, set previous_inferior_ptid
and clear infwait state.
(init_wait_for_inferior): Clear the stepping state,
previous_inferior_ptid and infwait state.
(waiton_ptid, infwait_state): New, split from
execution_control_state.
(struct execution_control_state): Members that persist through
events moved out to either struct thred_stepping_state or made
global. Deleted unneeded wp, saved_inferior_ptid, tmpstatus.
(wait_for_inferior, fetch_inferior_event): Use local
execution_control_state. Update to execution_control_state split.
(init_execution_control_state): Adjust.
(init_thread_stepping_state): New, extracted from
init_execution_control_state.
(context_switch): Take a ptid instead of an
execution_control_state.
(context_switch_to): Adjust.
(adjust_pc_after_break): Adjust.
(init_infwait_state): New.
(handle_inferior_event): Adjust.
2008-07-10 06:33:16 +08:00
|
|
|
|
infwait_state = infwait_normal_state;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
switch (ecs->ws.kind)
|
|
|
|
|
{
|
|
|
|
|
case TARGET_WAITKIND_LOADED:
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2005-01-20 00:09:46 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: TARGET_WAITKIND_LOADED\n");
|
2007-07-03 05:29:28 +08:00
|
|
|
|
/* Ignore gracefully during startup of the inferior, as it might
|
|
|
|
|
be the shell which has just loaded some objects, otherwise
|
|
|
|
|
add the symbols for the newly loaded objects. Also ignore at
|
|
|
|
|
the beginning of an attach or remote session; we will query
|
|
|
|
|
the full list of libraries once the connection is
|
|
|
|
|
established. */
|
2003-04-09 03:21:15 +08:00
|
|
|
|
if (stop_soon == NO_STOP_QUIETLY)
|
2002-07-19 01:53:50 +08:00
|
|
|
|
{
|
|
|
|
|
/* Check for any newly added shared libraries if we're
|
|
|
|
|
supposed to be adding them automatically. Switch
|
|
|
|
|
terminal for any messages produced by
|
|
|
|
|
breakpoint_re_set. */
|
|
|
|
|
target_terminal_ours_for_output ();
|
2003-11-26 00:01:36 +08:00
|
|
|
|
/* NOTE: cagney/2003-11-25: Make certain that the target
|
2004-08-25 22:47:07 +08:00
|
|
|
|
stack's section table is kept up-to-date. Architectures,
|
|
|
|
|
(e.g., PPC64), use the section table to perform
|
|
|
|
|
operations such as address => section name and hence
|
|
|
|
|
require the table to contain all sections (including
|
|
|
|
|
those found in shared libraries). */
|
2007-07-03 05:29:28 +08:00
|
|
|
|
#ifdef SOLIB_ADD
|
2003-11-26 00:01:36 +08:00
|
|
|
|
SOLIB_ADD (NULL, 0, ¤t_target, auto_solib_add);
|
2007-07-03 05:29:28 +08:00
|
|
|
|
#else
|
|
|
|
|
solib_add (NULL, 0, ¤t_target, auto_solib_add);
|
|
|
|
|
#endif
|
2002-07-19 01:53:50 +08:00
|
|
|
|
target_terminal_inferior ();
|
|
|
|
|
|
2007-07-03 05:29:28 +08:00
|
|
|
|
/* If requested, stop when the dynamic linker notifies
|
|
|
|
|
gdb of events. This allows the user to get control
|
|
|
|
|
and place breakpoints in initializer routines for
|
|
|
|
|
dynamically loaded objects (among other things). */
|
|
|
|
|
if (stop_on_solib_events)
|
|
|
|
|
{
|
|
|
|
|
stop_stepping (ecs);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* NOTE drow/2007-05-11: This might be a good place to check
|
|
|
|
|
for "catch load". */
|
2002-07-19 01:53:50 +08:00
|
|
|
|
}
|
2007-07-03 05:29:28 +08:00
|
|
|
|
|
|
|
|
|
/* If we are skipping through a shell, or through shared library
|
|
|
|
|
loading that we aren't interested in, resume the program. If
|
|
|
|
|
we're running the program normally, also resume. But stop if
|
|
|
|
|
we're attaching or setting up a remote connection. */
|
|
|
|
|
if (stop_soon == STOP_QUIETLY || stop_soon == NO_STOP_QUIETLY)
|
|
|
|
|
{
|
2008-04-24 18:21:45 +08:00
|
|
|
|
/* Loading of shared libraries might have changed breakpoint
|
|
|
|
|
addresses. Make sure new breakpoints are inserted. */
|
2008-05-04 07:18:23 +08:00
|
|
|
|
if (stop_soon == NO_STOP_QUIETLY
|
|
|
|
|
&& !breakpoints_always_inserted_mode ())
|
2008-04-24 18:21:45 +08:00
|
|
|
|
insert_breakpoints ();
|
2007-07-03 05:29:28 +08:00
|
|
|
|
resume (0, TARGET_SIGNAL_0);
|
|
|
|
|
prepare_to_wait (ecs);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
break;
|
1999-07-08 04:19:36 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
case TARGET_WAITKIND_SPURIOUS:
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2005-01-20 00:09:46 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: TARGET_WAITKIND_SPURIOUS\n");
|
2002-07-19 01:53:50 +08:00
|
|
|
|
resume (0, TARGET_SIGNAL_0);
|
|
|
|
|
prepare_to_wait (ecs);
|
|
|
|
|
return;
|
1999-07-08 04:19:36 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
case TARGET_WAITKIND_EXITED:
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2005-01-20 00:09:46 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: TARGET_WAITKIND_EXITED\n");
|
2008-12-12 03:19:12 +08:00
|
|
|
|
inferior_ptid = ecs->ptid;
|
2002-07-19 01:53:50 +08:00
|
|
|
|
target_terminal_ours (); /* Must do this before mourn anyway */
|
|
|
|
|
print_stop_reason (EXITED, ecs->ws.value.integer);
|
|
|
|
|
|
|
|
|
|
/* Record the exit code in the convenience variable $_exitcode, so
|
|
|
|
|
that the user can inspect this again later. */
|
2009-06-04 02:16:44 +08:00
|
|
|
|
set_internalvar_integer (lookup_internalvar ("_exitcode"),
|
|
|
|
|
(LONGEST) ecs->ws.value.integer);
|
2002-07-19 01:53:50 +08:00
|
|
|
|
gdb_flush (gdb_stdout);
|
|
|
|
|
target_mourn_inferior ();
|
2007-06-22 20:47:48 +08:00
|
|
|
|
singlestep_breakpoints_inserted_p = 0;
|
2002-07-19 01:53:50 +08:00
|
|
|
|
stop_print_frame = 0;
|
|
|
|
|
stop_stepping (ecs);
|
|
|
|
|
return;
|
1999-07-08 04:19:36 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
case TARGET_WAITKIND_SIGNALLED:
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2005-01-20 00:09:46 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: TARGET_WAITKIND_SIGNALLED\n");
|
2008-12-12 03:19:12 +08:00
|
|
|
|
inferior_ptid = ecs->ptid;
|
2002-07-19 01:53:50 +08:00
|
|
|
|
stop_print_frame = 0;
|
|
|
|
|
target_terminal_ours (); /* Must do this before mourn anyway */
|
1999-07-08 04:19:36 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
/* Note: By definition of TARGET_WAITKIND_SIGNALLED, we shouldn't
|
|
|
|
|
reach here unless the inferior is dead. However, for years
|
|
|
|
|
target_kill() was called here, which hints that fatal signals aren't
|
|
|
|
|
really fatal on some systems. If that's true, then some changes
|
|
|
|
|
may be needed. */
|
|
|
|
|
target_mourn_inferior ();
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2008-09-09 05:51:18 +08:00
|
|
|
|
print_stop_reason (SIGNAL_EXITED, ecs->ws.value.sig);
|
2007-06-22 20:47:48 +08:00
|
|
|
|
singlestep_breakpoints_inserted_p = 0;
|
2002-07-19 01:53:50 +08:00
|
|
|
|
stop_stepping (ecs);
|
|
|
|
|
return;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
/* The following are the only cases in which we keep going;
|
|
|
|
|
the above cases end in a continue or goto. */
|
|
|
|
|
case TARGET_WAITKIND_FORKED:
|
2002-12-16 04:15:56 +08:00
|
|
|
|
case TARGET_WAITKIND_VFORKED:
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2005-01-20 00:09:46 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: TARGET_WAITKIND_FORKED\n");
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2006-09-11 00:21:03 +08:00
|
|
|
|
if (!ptid_equal (ecs->ptid, inferior_ptid))
|
|
|
|
|
{
|
Refactor infrun a bit.
* infrun.c (currently_stepping): Take a struct
thread_stepping_state instead of an execution_control_state.
(struct thread_stepping_state): New, split from
execution_control_state.
(gtss, tss): New globals.
(proceed): Clear the stepping state, set previous_inferior_ptid
and clear infwait state.
(init_wait_for_inferior): Clear the stepping state,
previous_inferior_ptid and infwait state.
(waiton_ptid, infwait_state): New, split from
execution_control_state.
(struct execution_control_state): Members that persist through
events moved out to either struct thred_stepping_state or made
global. Deleted unneeded wp, saved_inferior_ptid, tmpstatus.
(wait_for_inferior, fetch_inferior_event): Use local
execution_control_state. Update to execution_control_state split.
(init_execution_control_state): Adjust.
(init_thread_stepping_state): New, extracted from
init_execution_control_state.
(context_switch): Take a ptid instead of an
execution_control_state.
(context_switch_to): Adjust.
(adjust_pc_after_break): Adjust.
(init_infwait_state): New.
(handle_inferior_event): Adjust.
2008-07-10 06:33:16 +08:00
|
|
|
|
context_switch (ecs->ptid);
|
2007-03-01 01:35:01 +08:00
|
|
|
|
reinit_frame_cache ();
|
2006-09-11 00:21:03 +08:00
|
|
|
|
}
|
|
|
|
|
|
2009-05-18 03:20:33 +08:00
|
|
|
|
/* Immediately detach breakpoints from the child before there's
|
|
|
|
|
any chance of letting the user delete breakpoints from the
|
|
|
|
|
breakpoint lists. If we don't do this early, it's easy to
|
|
|
|
|
leave left over traps in the child, vis: "break foo; catch
|
|
|
|
|
fork; c; <fork>; del; c; <child calls foo>". We only follow
|
|
|
|
|
the fork on the last `continue', and by that time the
|
|
|
|
|
breakpoint at "foo" is long gone from the breakpoint table.
|
|
|
|
|
If we vforked, then we don't need to unpatch here, since both
|
|
|
|
|
parent and child are sharing the same memory pages; we'll
|
|
|
|
|
need to unpatch at follow/detach time instead to be certain
|
|
|
|
|
that new breakpoints added between catchpoint hit time and
|
|
|
|
|
vfork follow are detached. */
|
|
|
|
|
if (ecs->ws.kind != TARGET_WAITKIND_VFORKED)
|
|
|
|
|
{
|
|
|
|
|
int child_pid = ptid_get_pid (ecs->ws.value.related_pid);
|
|
|
|
|
|
|
|
|
|
/* This won't actually modify the breakpoint list, but will
|
|
|
|
|
physically remove the breakpoints from the child. */
|
|
|
|
|
detach_breakpoints (child_pid);
|
|
|
|
|
}
|
|
|
|
|
|
2009-05-25 02:00:08 +08:00
|
|
|
|
/* In case the event is caught by a catchpoint, remember that
|
|
|
|
|
the event is to be followed at the next resume of the thread,
|
|
|
|
|
and not immediately. */
|
|
|
|
|
ecs->event_thread->pending_follow = ecs->ws;
|
|
|
|
|
|
2009-05-05 21:24:49 +08:00
|
|
|
|
stop_pc = regcache_read_pc (get_thread_regcache (ecs->ptid));
|
2002-12-16 04:08:02 +08:00
|
|
|
|
|
2008-09-09 05:46:21 +08:00
|
|
|
|
ecs->event_thread->stop_bpstat = bpstat_stop_status (stop_pc, ecs->ptid);
|
2002-12-16 04:08:02 +08:00
|
|
|
|
|
2008-09-09 05:46:21 +08:00
|
|
|
|
ecs->random_signal = !bpstat_explains_signal (ecs->event_thread->stop_bpstat);
|
2002-12-16 04:38:52 +08:00
|
|
|
|
|
|
|
|
|
/* If no catchpoint triggered for this, then keep going. */
|
|
|
|
|
if (ecs->random_signal)
|
|
|
|
|
{
|
2009-05-25 02:00:08 +08:00
|
|
|
|
int should_resume;
|
|
|
|
|
|
2008-09-09 05:51:18 +08:00
|
|
|
|
ecs->event_thread->stop_signal = TARGET_SIGNAL_0;
|
2009-05-25 02:00:08 +08:00
|
|
|
|
|
|
|
|
|
should_resume = follow_fork ();
|
|
|
|
|
|
|
|
|
|
ecs->event_thread = inferior_thread ();
|
|
|
|
|
ecs->ptid = inferior_ptid;
|
|
|
|
|
|
|
|
|
|
if (should_resume)
|
|
|
|
|
keep_going (ecs);
|
|
|
|
|
else
|
|
|
|
|
stop_stepping (ecs);
|
2002-12-16 04:38:52 +08:00
|
|
|
|
return;
|
|
|
|
|
}
|
2008-09-09 05:51:18 +08:00
|
|
|
|
ecs->event_thread->stop_signal = TARGET_SIGNAL_TRAP;
|
2002-07-19 01:53:50 +08:00
|
|
|
|
goto process_event_stop_test;
|
|
|
|
|
|
|
|
|
|
case TARGET_WAITKIND_EXECD:
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2006-07-22 22:48:03 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: TARGET_WAITKIND_EXECD\n");
|
2002-07-19 01:53:50 +08:00
|
|
|
|
|
2006-09-11 00:21:03 +08:00
|
|
|
|
if (!ptid_equal (ecs->ptid, inferior_ptid))
|
|
|
|
|
{
|
Refactor infrun a bit.
* infrun.c (currently_stepping): Take a struct
thread_stepping_state instead of an execution_control_state.
(struct thread_stepping_state): New, split from
execution_control_state.
(gtss, tss): New globals.
(proceed): Clear the stepping state, set previous_inferior_ptid
and clear infwait state.
(init_wait_for_inferior): Clear the stepping state,
previous_inferior_ptid and infwait state.
(waiton_ptid, infwait_state): New, split from
execution_control_state.
(struct execution_control_state): Members that persist through
events moved out to either struct thred_stepping_state or made
global. Deleted unneeded wp, saved_inferior_ptid, tmpstatus.
(wait_for_inferior, fetch_inferior_event): Use local
execution_control_state. Update to execution_control_state split.
(init_execution_control_state): Adjust.
(init_thread_stepping_state): New, extracted from
init_execution_control_state.
(context_switch): Take a ptid instead of an
execution_control_state.
(context_switch_to): Adjust.
(adjust_pc_after_break): Adjust.
(init_infwait_state): New.
(handle_inferior_event): Adjust.
2008-07-10 06:33:16 +08:00
|
|
|
|
context_switch (ecs->ptid);
|
2007-03-01 01:35:01 +08:00
|
|
|
|
reinit_frame_cache ();
|
2006-09-11 00:21:03 +08:00
|
|
|
|
}
|
|
|
|
|
|
2009-05-05 21:24:49 +08:00
|
|
|
|
stop_pc = regcache_read_pc (get_thread_regcache (ecs->ptid));
|
2008-09-22 23:25:54 +08:00
|
|
|
|
|
|
|
|
|
/* This causes the eventpoints and symbol table to be reset.
|
|
|
|
|
Must do this now, before trying to determine whether to
|
|
|
|
|
stop. */
|
2009-05-18 00:31:21 +08:00
|
|
|
|
follow_exec (inferior_ptid, ecs->ws.value.execd_pathname);
|
2008-09-22 23:25:54 +08:00
|
|
|
|
|
|
|
|
|
ecs->event_thread->stop_bpstat = bpstat_stop_status (stop_pc, ecs->ptid);
|
|
|
|
|
ecs->random_signal = !bpstat_explains_signal (ecs->event_thread->stop_bpstat);
|
|
|
|
|
|
2009-05-18 00:31:21 +08:00
|
|
|
|
/* Note that this may be referenced from inside
|
|
|
|
|
bpstat_stop_status above, through inferior_has_execd. */
|
|
|
|
|
xfree (ecs->ws.value.execd_pathname);
|
|
|
|
|
ecs->ws.value.execd_pathname = NULL;
|
|
|
|
|
|
2002-12-16 04:38:52 +08:00
|
|
|
|
/* If no catchpoint triggered for this, then keep going. */
|
|
|
|
|
if (ecs->random_signal)
|
|
|
|
|
{
|
2008-09-09 05:51:18 +08:00
|
|
|
|
ecs->event_thread->stop_signal = TARGET_SIGNAL_0;
|
2002-12-16 04:38:52 +08:00
|
|
|
|
keep_going (ecs);
|
|
|
|
|
return;
|
|
|
|
|
}
|
2008-09-09 05:51:18 +08:00
|
|
|
|
ecs->event_thread->stop_signal = TARGET_SIGNAL_TRAP;
|
2002-07-19 01:53:50 +08:00
|
|
|
|
goto process_event_stop_test;
|
|
|
|
|
|
2004-12-25 06:54:02 +08:00
|
|
|
|
/* Be careful not to try to gather much state about a thread
|
|
|
|
|
that's in a syscall. It's frequently a losing proposition. */
|
2002-07-19 01:53:50 +08:00
|
|
|
|
case TARGET_WAITKIND_SYSCALL_ENTRY:
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2005-01-20 00:09:46 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: TARGET_WAITKIND_SYSCALL_ENTRY\n");
|
2002-07-19 01:53:50 +08:00
|
|
|
|
resume (0, TARGET_SIGNAL_0);
|
|
|
|
|
prepare_to_wait (ecs);
|
|
|
|
|
return;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
/* Before examining the threads further, step this thread to
|
|
|
|
|
get it entirely out of the syscall. (We get notice of the
|
|
|
|
|
event when the thread is just on the verge of exiting a
|
|
|
|
|
syscall. Stepping one instruction seems to get it back
|
2004-12-25 06:54:02 +08:00
|
|
|
|
into user code.) */
|
2002-07-19 01:53:50 +08:00
|
|
|
|
case TARGET_WAITKIND_SYSCALL_RETURN:
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2005-01-20 00:09:46 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: TARGET_WAITKIND_SYSCALL_RETURN\n");
|
2002-07-19 01:53:50 +08:00
|
|
|
|
target_resume (ecs->ptid, 1, TARGET_SIGNAL_0);
|
|
|
|
|
prepare_to_wait (ecs);
|
|
|
|
|
return;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
case TARGET_WAITKIND_STOPPED:
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2005-01-20 00:09:46 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: TARGET_WAITKIND_STOPPED\n");
|
2008-09-09 05:51:18 +08:00
|
|
|
|
ecs->event_thread->stop_signal = ecs->ws.value.sig;
|
2002-07-19 01:53:50 +08:00
|
|
|
|
break;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2008-10-18 03:43:47 +08:00
|
|
|
|
case TARGET_WAITKIND_NO_HISTORY:
|
|
|
|
|
/* Reverse execution: target ran out of history info. */
|
2009-05-05 21:24:49 +08:00
|
|
|
|
stop_pc = regcache_read_pc (get_thread_regcache (ecs->ptid));
|
2008-10-18 03:43:47 +08:00
|
|
|
|
print_stop_reason (NO_HISTORY, 0);
|
|
|
|
|
stop_stepping (ecs);
|
|
|
|
|
return;
|
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
/* We had an event in the inferior, but we are not interested
|
|
|
|
|
in handling it at this level. The lower layers have already
|
2002-12-11 09:25:19 +08:00
|
|
|
|
done what needs to be done, if anything.
|
2004-08-25 22:47:07 +08:00
|
|
|
|
|
|
|
|
|
One of the possible circumstances for this is when the
|
|
|
|
|
inferior produces output for the console. The inferior has
|
|
|
|
|
not stopped, and we are ignoring the event. Another possible
|
|
|
|
|
circumstance is any event which the lower level knows will be
|
|
|
|
|
reported multiple times without an intervening resume. */
|
2002-07-19 01:53:50 +08:00
|
|
|
|
case TARGET_WAITKIND_IGNORE:
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2005-01-20 00:09:46 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: TARGET_WAITKIND_IGNORE\n");
|
2002-12-11 09:25:19 +08:00
|
|
|
|
prepare_to_wait (ecs);
|
2002-07-19 01:53:50 +08:00
|
|
|
|
return;
|
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
if (ecs->new_thread_event)
|
|
|
|
|
{
|
Non-stop inferior control.
* infrun.c (resume): In non-stop mode, always resume just one
thread.
(proceed): Don't call prepare_to_proceed in non-stop mode.
(fetch_inferior_event): In non-stop mode, switch context before
handling the event.
(error_is_running, ensure_not_running): New.
(handle_inferior_event): In non-stop mode: Mark only the event
thread as stopped. Require that the target module manages adding
threads to the thread list. Assert that there isn't a
deferred_step_ptid set. Don't switch to infwait_thread_hop_state.
(normal_stop): Only mark not-running if inferior hasn't exited.
In non-stop mode, only mark the event thread.
* thread.c:Include "cli/cli-decode.h".
(print_thread_info): Don't read from a running thread.
Output "(running)" if thread is running.
(switch_to_thread): Don't read stop_pc if thread is executing.
(do_restore_current_thread_cleanup): Don't write to a running
thread.
(thread_apply_all_command): Don't read from a running thread. In
non-stop mode, do a full context-switch instead of just switching
threads.
(thread_apply_command): In non-stop mode, do a full context-switch
instead of just switching threads.
(do_captured_thread_select): Likewise. Inform user if selected
thread is running.
(_initialize_thread): Mark "info threads" and "thread" and
async_ok.
* inf-loop.c (inferior_event_handler): In non-stop mode, don't
unregister the target from the event loop.
* infcmd.c (continue_command, step_1, jump_command)
(signal_command): Ensure the selected thread isn't running.
(interrupt_target_command): In non-stop mode, interrupt only the
selected thread.
* inferior.h (error_is_running, ensure_not_running): Declare.
* target.h (struct target_ops): Add ptid argument to the to_stop
member.
(target_stop): Add ptid_t argument.
* target.c (update_current_target): Add ptid argument to to_stop's
type.
(debug_to_stop): Add ptid_t argument.
(debug_to_rcmd): Set to_stop_ptid.
* remote.c (remote_stop): Add ptid_t argument.
(async_remote_interrupt): Add inferior_ptid to target_stop.
* inf-ptrace.c (inf_ptrace_stop): Add ptid argument.
* Makefile.in (thread.o): Depend on $(cli_decode_h).
2008-07-10 06:42:43 +08:00
|
|
|
|
if (non_stop)
|
|
|
|
|
/* Non-stop assumes that the target handles adding new threads
|
|
|
|
|
to the thread list. */
|
|
|
|
|
internal_error (__FILE__, __LINE__, "\
|
|
|
|
|
targets should add new threads to the thread list themselves in non-stop mode.");
|
|
|
|
|
|
|
|
|
|
/* We may want to consider not doing a resume here in order to
|
|
|
|
|
give the user a chance to play with the new thread. It might
|
|
|
|
|
be good to make that a user-settable option. */
|
|
|
|
|
|
|
|
|
|
/* At this point, all threads are stopped (happens automatically
|
|
|
|
|
in either the OS or the native code). Therefore we need to
|
|
|
|
|
continue all threads in order to make progress. */
|
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
target_resume (RESUME_ALL, 0, TARGET_SIGNAL_0);
|
|
|
|
|
prepare_to_wait (ecs);
|
|
|
|
|
return;
|
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2008-09-09 05:51:18 +08:00
|
|
|
|
if (ecs->ws.kind == TARGET_WAITKIND_STOPPED)
|
2008-10-24 07:11:21 +08:00
|
|
|
|
{
|
|
|
|
|
/* Do we need to clean up the state of a thread that has
|
|
|
|
|
completed a displaced single-step? (Doing so usually affects
|
|
|
|
|
the PC, so do it here, before we set stop_pc.) */
|
|
|
|
|
displaced_step_fixup (ecs->ptid, ecs->event_thread->stop_signal);
|
|
|
|
|
|
|
|
|
|
/* If we either finished a single-step or hit a breakpoint, but
|
|
|
|
|
the user wanted this thread to be stopped, pretend we got a
|
|
|
|
|
SIG0 (generic unsignaled stop). */
|
|
|
|
|
|
|
|
|
|
if (ecs->event_thread->stop_requested
|
|
|
|
|
&& ecs->event_thread->stop_signal == TARGET_SIGNAL_TRAP)
|
|
|
|
|
ecs->event_thread->stop_signal = TARGET_SIGNAL_0;
|
|
|
|
|
}
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
|
2008-05-04 22:12:34 +08:00
|
|
|
|
stop_pc = regcache_read_pc (get_thread_regcache (ecs->ptid));
|
2002-07-19 01:53:50 +08:00
|
|
|
|
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
{
|
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: stop_pc = 0x%s\n",
|
|
|
|
|
paddr_nz (stop_pc));
|
2009-05-11 19:13:09 +08:00
|
|
|
|
if (target_stopped_by_watchpoint ())
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
{
|
|
|
|
|
CORE_ADDR addr;
|
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: stopped by watchpoint\n");
|
|
|
|
|
|
|
|
|
|
if (target_stopped_data_address (¤t_target, &addr))
|
|
|
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
|
|
|
"infrun: stopped data address = 0x%s\n",
|
|
|
|
|
paddr_nz (addr));
|
|
|
|
|
else
|
|
|
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
|
|
|
"infrun: (no data address available)\n");
|
|
|
|
|
}
|
|
|
|
|
}
|
2004-11-09 01:25:23 +08:00
|
|
|
|
|
2004-02-17 04:49:51 +08:00
|
|
|
|
if (stepping_past_singlestep_breakpoint)
|
|
|
|
|
{
|
2007-06-22 20:47:48 +08:00
|
|
|
|
gdb_assert (singlestep_breakpoints_inserted_p);
|
2004-02-17 04:49:51 +08:00
|
|
|
|
gdb_assert (ptid_equal (singlestep_ptid, ecs->ptid));
|
|
|
|
|
gdb_assert (!ptid_equal (singlestep_ptid, saved_singlestep_ptid));
|
|
|
|
|
|
|
|
|
|
stepping_past_singlestep_breakpoint = 0;
|
|
|
|
|
|
|
|
|
|
/* We've either finished single-stepping past the single-step
|
2004-08-25 22:47:07 +08:00
|
|
|
|
breakpoint, or stopped for some other reason. It would be nice if
|
|
|
|
|
we could tell, but we can't reliably. */
|
2008-09-09 05:51:18 +08:00
|
|
|
|
if (ecs->event_thread->stop_signal == TARGET_SIGNAL_TRAP)
|
2004-08-25 22:47:07 +08:00
|
|
|
|
{
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2005-01-20 00:09:46 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: stepping_past_singlestep_breakpoint\n");
|
2004-02-17 04:49:51 +08:00
|
|
|
|
/* Pull the single step breakpoints out of the target. */
|
2007-04-15 02:10:54 +08:00
|
|
|
|
remove_single_step_breakpoints ();
|
2004-02-17 04:49:51 +08:00
|
|
|
|
singlestep_breakpoints_inserted_p = 0;
|
|
|
|
|
|
|
|
|
|
ecs->random_signal = 0;
|
|
|
|
|
|
Refactor infrun a bit.
* infrun.c (currently_stepping): Take a struct
thread_stepping_state instead of an execution_control_state.
(struct thread_stepping_state): New, split from
execution_control_state.
(gtss, tss): New globals.
(proceed): Clear the stepping state, set previous_inferior_ptid
and clear infwait state.
(init_wait_for_inferior): Clear the stepping state,
previous_inferior_ptid and infwait state.
(waiton_ptid, infwait_state): New, split from
execution_control_state.
(struct execution_control_state): Members that persist through
events moved out to either struct thred_stepping_state or made
global. Deleted unneeded wp, saved_inferior_ptid, tmpstatus.
(wait_for_inferior, fetch_inferior_event): Use local
execution_control_state. Update to execution_control_state split.
(init_execution_control_state): Adjust.
(init_thread_stepping_state): New, extracted from
init_execution_control_state.
(context_switch): Take a ptid instead of an
execution_control_state.
(context_switch_to): Adjust.
(adjust_pc_after_break): Adjust.
(init_infwait_state): New.
(handle_inferior_event): Adjust.
2008-07-10 06:33:16 +08:00
|
|
|
|
context_switch (saved_singlestep_ptid);
|
2004-04-21 Andrew Cagney <cagney@redhat.com>
* annotate.h (deprecated_annotate_starting_hook)
(deprecated_annotate_stopped_hook)
(deprecated_annotate_exited_hook)
(deprecated_annotate_signal_hook)
(deprecated_annotate_signalled_hook): Deprecate.
* tracepoint.h (deprecated_create_tracepoint_hook)
(deprecated_delete_tracepoint_hook)
(deprecated_modify_tracepoint_hook)
(deprecated_trace_find_hook)
(deprecated_trace_start_stop_hook): Deprecate.
* target.h (deprecated_target_new_objfile_hook): Deprecate.
* remote.h (deprecated_target_resume_hook)
(deprecated_target_wait_loop_hook): Deprecate.
* gdbcore.h (deprecated_exec_file_display_hook)
(deprecated_file_changed_hook): Deprecate.
* frame.h (deprecated_selected_frame_level_changed_hook): Deprecate.
* defs.h (deprecated_modify_breakpoint_hook)
(deprecated_command_loop_hook, deprecated_show_load_progress)
(deprecated_print_frame_info_listing_hook)
(deprecated_query_hook, deprecated_warning_hook)
(deprecated_flush_hook, deprecated_create_breakpoint_hook)
(deprecated_delete_breakpoint_hook)
(deprecated_interactive_hook, deprecated_registers_changed_hook)
(deprecated_readline_begin_hook, deprecated_readline_hook)
(deprecated_readline_end_hook, deprecated_register_changed_hook)
(deprecated_memory_changed_hook, deprecated_init_ui_hook)
(deprecated_context_hook, deprecated_target_wait_hook)
(deprecated_attach_hook, deprecated_detach_hook)
(deprecated_call_command_hook, deprecated_set_hook)
(deprecated_error_hook, deprecated_error_begin_hook)
(deprecated_ui_load_progress_hook): Deprecate.
* valops.c, uw-thread.c, utils.c, tui/tui-io.c: Update.
* tui/tui-hooks.c, tracepoint.c, top.c, thread-db.c: Update.
* target.c, symfile.c, stack.c, sol-thread.c, rs6000-nat.c: Update.
* remote.c, remote-mips.c, regcache.c, mi/mi-interp.c: Update.
* main.c, interps.c, infcmd.c, hpux-thread.c, frame.c: Update.
* exec.c, dsrec.c, d10v-tdep.c, corefile.c, complaints.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, breakpoint.c: Update.
* annotate.c, aix-thread.c: Update.
2004-04-22 07:52:21 +08:00
|
|
|
|
if (deprecated_context_hook)
|
|
|
|
|
deprecated_context_hook (pid_to_thread_id (ecs->ptid));
|
2004-02-17 04:49:51 +08:00
|
|
|
|
|
|
|
|
|
resume (1, TARGET_SIGNAL_0);
|
|
|
|
|
prepare_to_wait (ecs);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2007-12-06 20:57:51 +08:00
|
|
|
|
if (!ptid_equal (deferred_step_ptid, null_ptid))
|
2007-09-11 02:49:26 +08:00
|
|
|
|
{
|
Non-stop inferior control.
* infrun.c (resume): In non-stop mode, always resume just one
thread.
(proceed): Don't call prepare_to_proceed in non-stop mode.
(fetch_inferior_event): In non-stop mode, switch context before
handling the event.
(error_is_running, ensure_not_running): New.
(handle_inferior_event): In non-stop mode: Mark only the event
thread as stopped. Require that the target module manages adding
threads to the thread list. Assert that there isn't a
deferred_step_ptid set. Don't switch to infwait_thread_hop_state.
(normal_stop): Only mark not-running if inferior hasn't exited.
In non-stop mode, only mark the event thread.
* thread.c:Include "cli/cli-decode.h".
(print_thread_info): Don't read from a running thread.
Output "(running)" if thread is running.
(switch_to_thread): Don't read stop_pc if thread is executing.
(do_restore_current_thread_cleanup): Don't write to a running
thread.
(thread_apply_all_command): Don't read from a running thread. In
non-stop mode, do a full context-switch instead of just switching
threads.
(thread_apply_command): In non-stop mode, do a full context-switch
instead of just switching threads.
(do_captured_thread_select): Likewise. Inform user if selected
thread is running.
(_initialize_thread): Mark "info threads" and "thread" and
async_ok.
* inf-loop.c (inferior_event_handler): In non-stop mode, don't
unregister the target from the event loop.
* infcmd.c (continue_command, step_1, jump_command)
(signal_command): Ensure the selected thread isn't running.
(interrupt_target_command): In non-stop mode, interrupt only the
selected thread.
* inferior.h (error_is_running, ensure_not_running): Declare.
* target.h (struct target_ops): Add ptid argument to the to_stop
member.
(target_stop): Add ptid_t argument.
* target.c (update_current_target): Add ptid argument to to_stop's
type.
(debug_to_stop): Add ptid_t argument.
(debug_to_rcmd): Set to_stop_ptid.
* remote.c (remote_stop): Add ptid_t argument.
(async_remote_interrupt): Add inferior_ptid to target_stop.
* inf-ptrace.c (inf_ptrace_stop): Add ptid argument.
* Makefile.in (thread.o): Depend on $(cli_decode_h).
2008-07-10 06:42:43 +08:00
|
|
|
|
/* In non-stop mode, there's never a deferred_step_ptid set. */
|
|
|
|
|
gdb_assert (!non_stop);
|
|
|
|
|
|
2007-09-11 02:49:26 +08:00
|
|
|
|
/* If we stopped for some other reason than single-stepping, ignore
|
|
|
|
|
the fact that we were supposed to switch back. */
|
2008-09-09 05:51:18 +08:00
|
|
|
|
if (ecs->event_thread->stop_signal == TARGET_SIGNAL_TRAP)
|
2007-09-11 02:49:26 +08:00
|
|
|
|
{
|
|
|
|
|
if (debug_infrun)
|
|
|
|
|
fprintf_unfiltered (gdb_stdlog,
|
2007-12-06 20:57:51 +08:00
|
|
|
|
"infrun: handling deferred step\n");
|
2007-09-11 02:49:26 +08:00
|
|
|
|
|
|
|
|
|
/* Pull the single step breakpoints out of the target. */
|
|
|
|
|
if (singlestep_breakpoints_inserted_p)
|
|
|
|
|
{
|
|
|
|
|
remove_single_step_breakpoints ();
|
|
|
|
|
singlestep_breakpoints_inserted_p = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Note: We do not call context_switch at this point, as the
|
|
|
|
|
context is already set up for stepping the original thread. */
|
2007-12-06 20:57:51 +08:00
|
|
|
|
switch_to_thread (deferred_step_ptid);
|
|
|
|
|
deferred_step_ptid = null_ptid;
|
2007-09-11 02:49:26 +08:00
|
|
|
|
/* Suppress spurious "Switching to ..." message. */
|
|
|
|
|
previous_inferior_ptid = inferior_ptid;
|
|
|
|
|
|
|
|
|
|
resume (1, TARGET_SIGNAL_0);
|
|
|
|
|
prepare_to_wait (ecs);
|
|
|
|
|
return;
|
|
|
|
|
}
|
2007-12-06 20:57:51 +08:00
|
|
|
|
|
|
|
|
|
deferred_step_ptid = null_ptid;
|
2007-09-11 02:49:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
/* See if a thread hit a thread-specific breakpoint that was meant for
|
|
|
|
|
another thread. If so, then step that thread past the breakpoint,
|
|
|
|
|
and continue it. */
|
|
|
|
|
|
2008-09-09 05:51:18 +08:00
|
|
|
|
if (ecs->event_thread->stop_signal == TARGET_SIGNAL_TRAP)
|
2002-07-19 01:53:50 +08:00
|
|
|
|
{
|
2004-02-17 04:49:51 +08:00
|
|
|
|
int thread_hop_needed = 0;
|
|
|
|
|
|
2002-08-17 01:56:17 +08:00
|
|
|
|
/* Check if a regular breakpoint has been hit before checking
|
|
|
|
|
for a potential single step breakpoint. Otherwise, GDB will
|
|
|
|
|
not see this breakpoint hit when stepping onto breakpoints. */
|
2007-11-29 15:48:21 +08:00
|
|
|
|
if (regular_breakpoint_inserted_here_p (stop_pc))
|
2002-07-19 01:53:50 +08:00
|
|
|
|
{
|
1999-07-08 04:19:36 +08:00
|
|
|
|
ecs->random_signal = 0;
|
2004-02-01 03:18:13 +08:00
|
|
|
|
if (!breakpoint_thread_match (stop_pc, ecs->ptid))
|
2004-02-17 04:49:51 +08:00
|
|
|
|
thread_hop_needed = 1;
|
|
|
|
|
}
|
2007-06-22 20:47:48 +08:00
|
|
|
|
else if (singlestep_breakpoints_inserted_p)
|
2004-02-17 04:49:51 +08:00
|
|
|
|
{
|
2007-01-11 04:10:23 +08:00
|
|
|
|
/* We have not context switched yet, so this should be true
|
|
|
|
|
no matter which thread hit the singlestep breakpoint. */
|
|
|
|
|
gdb_assert (ptid_equal (inferior_ptid, singlestep_ptid));
|
|
|
|
|
if (debug_infrun)
|
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: software single step "
|
|
|
|
|
"trap for %s\n",
|
|
|
|
|
target_pid_to_str (ecs->ptid));
|
|
|
|
|
|
2004-02-17 04:49:51 +08:00
|
|
|
|
ecs->random_signal = 0;
|
|
|
|
|
/* The call to in_thread_list is necessary because PTIDs sometimes
|
|
|
|
|
change when we go from single-threaded to multi-threaded. If
|
|
|
|
|
the singlestep_ptid is still in the list, assume that it is
|
|
|
|
|
really different from ecs->ptid. */
|
|
|
|
|
if (!ptid_equal (singlestep_ptid, ecs->ptid)
|
|
|
|
|
&& in_thread_list (singlestep_ptid))
|
|
|
|
|
{
|
2007-01-11 04:10:23 +08:00
|
|
|
|
/* If the PC of the thread we were trying to single-step
|
|
|
|
|
has changed, discard this event (which we were going
|
|
|
|
|
to ignore anyway), and pretend we saw that thread
|
|
|
|
|
trap. This prevents us continuously moving the
|
|
|
|
|
single-step breakpoint forward, one instruction at a
|
|
|
|
|
time. If the PC has changed, then the thread we were
|
|
|
|
|
trying to single-step has trapped or been signalled,
|
|
|
|
|
but the event has not been reported to GDB yet.
|
|
|
|
|
|
|
|
|
|
There might be some cases where this loses signal
|
|
|
|
|
information, if a signal has arrived at exactly the
|
|
|
|
|
same time that the PC changed, but this is the best
|
|
|
|
|
we can do with the information available. Perhaps we
|
|
|
|
|
should arrange to report all events for all threads
|
|
|
|
|
when they stop, or to re-poll the remote looking for
|
|
|
|
|
this particular thread (i.e. temporarily enable
|
|
|
|
|
schedlock). */
|
2008-05-04 22:12:34 +08:00
|
|
|
|
|
|
|
|
|
CORE_ADDR new_singlestep_pc
|
|
|
|
|
= regcache_read_pc (get_thread_regcache (singlestep_ptid));
|
|
|
|
|
|
|
|
|
|
if (new_singlestep_pc != singlestep_pc)
|
2007-01-11 04:10:23 +08:00
|
|
|
|
{
|
2008-09-09 05:51:18 +08:00
|
|
|
|
enum target_signal stop_signal;
|
|
|
|
|
|
2007-01-11 04:10:23 +08:00
|
|
|
|
if (debug_infrun)
|
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: unexpected thread,"
|
|
|
|
|
" but expected thread advanced also\n");
|
|
|
|
|
|
|
|
|
|
/* The current context still belongs to
|
|
|
|
|
singlestep_ptid. Don't swap here, since that's
|
|
|
|
|
the context we want to use. Just fudge our
|
|
|
|
|
state and continue. */
|
2008-09-09 05:51:18 +08:00
|
|
|
|
stop_signal = ecs->event_thread->stop_signal;
|
|
|
|
|
ecs->event_thread->stop_signal = TARGET_SIGNAL_0;
|
2007-01-11 04:10:23 +08:00
|
|
|
|
ecs->ptid = singlestep_ptid;
|
2009-05-25 05:06:53 +08:00
|
|
|
|
ecs->event_thread = find_thread_ptid (ecs->ptid);
|
2008-09-09 05:51:18 +08:00
|
|
|
|
ecs->event_thread->stop_signal = stop_signal;
|
2008-05-04 22:12:34 +08:00
|
|
|
|
stop_pc = new_singlestep_pc;
|
2007-01-11 04:10:23 +08:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (debug_infrun)
|
|
|
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
|
|
|
"infrun: unexpected thread\n");
|
|
|
|
|
|
|
|
|
|
thread_hop_needed = 1;
|
|
|
|
|
stepping_past_singlestep_breakpoint = 1;
|
|
|
|
|
saved_singlestep_ptid = singlestep_ptid;
|
|
|
|
|
}
|
2004-02-17 04:49:51 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (thread_hop_needed)
|
2004-08-25 22:47:07 +08:00
|
|
|
|
{
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
int remove_status = 0;
|
2004-08-25 22:47:07 +08:00
|
|
|
|
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2005-01-20 00:09:46 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: thread_hop_needed\n");
|
2004-11-09 01:25:23 +08:00
|
|
|
|
|
2009-05-29 01:19:58 +08:00
|
|
|
|
/* Switch context before touching inferior memory, the
|
|
|
|
|
previous thread may have exited. */
|
|
|
|
|
if (!ptid_equal (inferior_ptid, ecs->ptid))
|
|
|
|
|
context_switch (ecs->ptid);
|
|
|
|
|
|
2004-08-25 22:47:07 +08:00
|
|
|
|
/* Saw a breakpoint, but it was hit by the wrong thread.
|
|
|
|
|
Just continue. */
|
|
|
|
|
|
2007-06-22 20:47:48 +08:00
|
|
|
|
if (singlestep_breakpoints_inserted_p)
|
2002-07-19 01:53:50 +08:00
|
|
|
|
{
|
2004-08-25 22:47:07 +08:00
|
|
|
|
/* Pull the single step breakpoints out of the target. */
|
2007-04-15 02:10:54 +08:00
|
|
|
|
remove_single_step_breakpoints ();
|
2004-08-25 22:47:07 +08:00
|
|
|
|
singlestep_breakpoints_inserted_p = 0;
|
|
|
|
|
}
|
|
|
|
|
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
/* If the arch can displace step, don't remove the
|
|
|
|
|
breakpoints. */
|
|
|
|
|
if (!use_displaced_stepping (current_gdbarch))
|
|
|
|
|
remove_status = remove_breakpoints ();
|
|
|
|
|
|
2004-08-25 22:47:07 +08:00
|
|
|
|
/* Did we fail to remove breakpoints? If so, try
|
|
|
|
|
to set the PC past the bp. (There's at least
|
|
|
|
|
one situation in which we can fail to remove
|
|
|
|
|
the bp's: On HP-UX's that use ttrace, we can't
|
|
|
|
|
change the address space of a vforking child
|
|
|
|
|
process until the child exits (well, okay, not
|
|
|
|
|
then either :-) or execs. */
|
|
|
|
|
if (remove_status != 0)
|
2008-01-22 00:34:00 +08:00
|
|
|
|
error (_("Cannot step over breakpoint hit in wrong thread"));
|
2004-08-25 22:47:07 +08:00
|
|
|
|
else
|
|
|
|
|
{ /* Single step */
|
Non-stop inferior control.
* infrun.c (resume): In non-stop mode, always resume just one
thread.
(proceed): Don't call prepare_to_proceed in non-stop mode.
(fetch_inferior_event): In non-stop mode, switch context before
handling the event.
(error_is_running, ensure_not_running): New.
(handle_inferior_event): In non-stop mode: Mark only the event
thread as stopped. Require that the target module manages adding
threads to the thread list. Assert that there isn't a
deferred_step_ptid set. Don't switch to infwait_thread_hop_state.
(normal_stop): Only mark not-running if inferior hasn't exited.
In non-stop mode, only mark the event thread.
* thread.c:Include "cli/cli-decode.h".
(print_thread_info): Don't read from a running thread.
Output "(running)" if thread is running.
(switch_to_thread): Don't read stop_pc if thread is executing.
(do_restore_current_thread_cleanup): Don't write to a running
thread.
(thread_apply_all_command): Don't read from a running thread. In
non-stop mode, do a full context-switch instead of just switching
threads.
(thread_apply_command): In non-stop mode, do a full context-switch
instead of just switching threads.
(do_captured_thread_select): Likewise. Inform user if selected
thread is running.
(_initialize_thread): Mark "info threads" and "thread" and
async_ok.
* inf-loop.c (inferior_event_handler): In non-stop mode, don't
unregister the target from the event loop.
* infcmd.c (continue_command, step_1, jump_command)
(signal_command): Ensure the selected thread isn't running.
(interrupt_target_command): In non-stop mode, interrupt only the
selected thread.
* inferior.h (error_is_running, ensure_not_running): Declare.
* target.h (struct target_ops): Add ptid argument to the to_stop
member.
(target_stop): Add ptid_t argument.
* target.c (update_current_target): Add ptid argument to to_stop's
type.
(debug_to_stop): Add ptid_t argument.
(debug_to_rcmd): Set to_stop_ptid.
* remote.c (remote_stop): Add ptid_t argument.
(async_remote_interrupt): Add inferior_ptid to target_stop.
* inf-ptrace.c (inf_ptrace_stop): Add ptid argument.
* Makefile.in (thread.o): Depend on $(cli_decode_h).
2008-07-10 06:42:43 +08:00
|
|
|
|
if (!non_stop)
|
|
|
|
|
{
|
|
|
|
|
/* Only need to require the next event from this
|
|
|
|
|
thread in all-stop mode. */
|
|
|
|
|
waiton_ptid = ecs->ptid;
|
|
|
|
|
infwait_state = infwait_thread_hop_state;
|
|
|
|
|
}
|
2004-08-25 22:47:07 +08:00
|
|
|
|
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
ecs->event_thread->stepping_over_breakpoint = 1;
|
2004-08-25 22:47:07 +08:00
|
|
|
|
keep_going (ecs);
|
|
|
|
|
registers_changed ();
|
|
|
|
|
return;
|
|
|
|
|
}
|
2002-07-19 01:53:50 +08:00
|
|
|
|
}
|
2007-06-22 20:47:48 +08:00
|
|
|
|
else if (singlestep_breakpoints_inserted_p)
|
2004-08-25 22:47:07 +08:00
|
|
|
|
{
|
|
|
|
|
sw_single_step_trap_p = 1;
|
|
|
|
|
ecs->random_signal = 0;
|
|
|
|
|
}
|
2002-07-19 01:53:50 +08:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
ecs->random_signal = 1;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
/* See if something interesting happened to the non-current thread. If
|
2004-03-10 00:40:08 +08:00
|
|
|
|
so, then switch to that thread. */
|
|
|
|
|
if (!ptid_equal (ecs->ptid, inferior_ptid))
|
2002-07-19 01:53:50 +08:00
|
|
|
|
{
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2005-01-20 00:09:46 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: context switch\n");
|
2004-11-09 01:25:23 +08:00
|
|
|
|
|
Refactor infrun a bit.
* infrun.c (currently_stepping): Take a struct
thread_stepping_state instead of an execution_control_state.
(struct thread_stepping_state): New, split from
execution_control_state.
(gtss, tss): New globals.
(proceed): Clear the stepping state, set previous_inferior_ptid
and clear infwait state.
(init_wait_for_inferior): Clear the stepping state,
previous_inferior_ptid and infwait state.
(waiton_ptid, infwait_state): New, split from
execution_control_state.
(struct execution_control_state): Members that persist through
events moved out to either struct thred_stepping_state or made
global. Deleted unneeded wp, saved_inferior_ptid, tmpstatus.
(wait_for_inferior, fetch_inferior_event): Use local
execution_control_state. Update to execution_control_state split.
(init_execution_control_state): Adjust.
(init_thread_stepping_state): New, extracted from
init_execution_control_state.
(context_switch): Take a ptid instead of an
execution_control_state.
(context_switch_to): Adjust.
(adjust_pc_after_break): Adjust.
(init_infwait_state): New.
(handle_inferior_event): Adjust.
2008-07-10 06:33:16 +08:00
|
|
|
|
context_switch (ecs->ptid);
|
1999-07-08 04:19:36 +08:00
|
|
|
|
|
2004-04-21 Andrew Cagney <cagney@redhat.com>
* annotate.h (deprecated_annotate_starting_hook)
(deprecated_annotate_stopped_hook)
(deprecated_annotate_exited_hook)
(deprecated_annotate_signal_hook)
(deprecated_annotate_signalled_hook): Deprecate.
* tracepoint.h (deprecated_create_tracepoint_hook)
(deprecated_delete_tracepoint_hook)
(deprecated_modify_tracepoint_hook)
(deprecated_trace_find_hook)
(deprecated_trace_start_stop_hook): Deprecate.
* target.h (deprecated_target_new_objfile_hook): Deprecate.
* remote.h (deprecated_target_resume_hook)
(deprecated_target_wait_loop_hook): Deprecate.
* gdbcore.h (deprecated_exec_file_display_hook)
(deprecated_file_changed_hook): Deprecate.
* frame.h (deprecated_selected_frame_level_changed_hook): Deprecate.
* defs.h (deprecated_modify_breakpoint_hook)
(deprecated_command_loop_hook, deprecated_show_load_progress)
(deprecated_print_frame_info_listing_hook)
(deprecated_query_hook, deprecated_warning_hook)
(deprecated_flush_hook, deprecated_create_breakpoint_hook)
(deprecated_delete_breakpoint_hook)
(deprecated_interactive_hook, deprecated_registers_changed_hook)
(deprecated_readline_begin_hook, deprecated_readline_hook)
(deprecated_readline_end_hook, deprecated_register_changed_hook)
(deprecated_memory_changed_hook, deprecated_init_ui_hook)
(deprecated_context_hook, deprecated_target_wait_hook)
(deprecated_attach_hook, deprecated_detach_hook)
(deprecated_call_command_hook, deprecated_set_hook)
(deprecated_error_hook, deprecated_error_begin_hook)
(deprecated_ui_load_progress_hook): Deprecate.
* valops.c, uw-thread.c, utils.c, tui/tui-io.c: Update.
* tui/tui-hooks.c, tracepoint.c, top.c, thread-db.c: Update.
* target.c, symfile.c, stack.c, sol-thread.c, rs6000-nat.c: Update.
* remote.c, remote-mips.c, regcache.c, mi/mi-interp.c: Update.
* main.c, interps.c, infcmd.c, hpux-thread.c, frame.c: Update.
* exec.c, dsrec.c, d10v-tdep.c, corefile.c, complaints.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, breakpoint.c: Update.
* annotate.c, aix-thread.c: Update.
2004-04-22 07:52:21 +08:00
|
|
|
|
if (deprecated_context_hook)
|
|
|
|
|
deprecated_context_hook (pid_to_thread_id (ecs->ptid));
|
2002-07-19 01:53:50 +08:00
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2007-06-22 20:47:48 +08:00
|
|
|
|
if (singlestep_breakpoints_inserted_p)
|
2002-07-19 01:53:50 +08:00
|
|
|
|
{
|
|
|
|
|
/* Pull the single step breakpoints out of the target. */
|
2007-04-15 02:10:54 +08:00
|
|
|
|
remove_single_step_breakpoints ();
|
2002-07-19 01:53:50 +08:00
|
|
|
|
singlestep_breakpoints_inserted_p = 0;
|
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2007-10-01 08:17:58 +08:00
|
|
|
|
if (stepped_after_stopped_by_watchpoint)
|
|
|
|
|
stopped_by_watchpoint = 0;
|
|
|
|
|
else
|
|
|
|
|
stopped_by_watchpoint = watchpoints_triggered (&ecs->ws);
|
|
|
|
|
|
|
|
|
|
/* If necessary, step over this watchpoint. We'll be back to display
|
|
|
|
|
it in a moment. */
|
|
|
|
|
if (stopped_by_watchpoint
|
2009-05-11 19:13:09 +08:00
|
|
|
|
&& (target_have_steppable_watchpoint
|
2007-10-01 08:17:58 +08:00
|
|
|
|
|| gdbarch_have_nonsteppable_watchpoint (current_gdbarch)))
|
2002-07-19 01:53:50 +08:00
|
|
|
|
{
|
|
|
|
|
/* At this point, we are stopped at an instruction which has
|
|
|
|
|
attempted to write to a piece of memory under control of
|
|
|
|
|
a watchpoint. The instruction hasn't actually executed
|
|
|
|
|
yet. If we were to evaluate the watchpoint expression
|
|
|
|
|
now, we would get the old value, and therefore no change
|
|
|
|
|
would seem to have occurred.
|
|
|
|
|
|
|
|
|
|
In order to make watchpoints work `right', we really need
|
|
|
|
|
to complete the memory write, and then evaluate the
|
2007-10-01 08:17:58 +08:00
|
|
|
|
watchpoint expression. We do this by single-stepping the
|
|
|
|
|
target.
|
|
|
|
|
|
|
|
|
|
It may not be necessary to disable the watchpoint to stop over
|
|
|
|
|
it. For example, the PA can (with some kernel cooperation)
|
|
|
|
|
single step over a watchpoint without disabling the watchpoint.
|
|
|
|
|
|
|
|
|
|
It is far more common to need to disable a watchpoint to step
|
|
|
|
|
the inferior over it. If we have non-steppable watchpoints,
|
|
|
|
|
we must disable the current watchpoint; it's simplest to
|
|
|
|
|
disable all watchpoints and breakpoints. */
|
2009-04-14 08:59:47 +08:00
|
|
|
|
int hw_step = 1;
|
|
|
|
|
|
2009-05-11 19:13:09 +08:00
|
|
|
|
if (!target_have_steppable_watchpoint)
|
2007-10-01 08:17:58 +08:00
|
|
|
|
remove_breakpoints ();
|
2009-04-14 08:59:47 +08:00
|
|
|
|
/* Single step */
|
2009-05-05 21:24:49 +08:00
|
|
|
|
hw_step = maybe_software_singlestep (current_gdbarch, stop_pc);
|
2009-04-14 08:59:47 +08:00
|
|
|
|
target_resume (ecs->ptid, hw_step, TARGET_SIGNAL_0);
|
2009-04-20 David Daney <ddaney@caviumnetworks.com>
* NEWS: Mention MIPS/Linux hardware watchpoint support.
2009-04-20 David Daney <ddaney@caviumnetworks.com>
* mips-linux-nat.c (command.h, gdbcmd.h, gdb_assert.h): New #includes.
(maint_show_dr, super_close): New variables.
(super_fetch_registers, super_store_registers): Make static.
(PTRACE_GET_WATCH_REGS, PTRACE_SET_WATCH_REGS, W_BIT, R_BIT, I_BIT)
(W_MASK, R_MASK, I_MASK, IRW_MASK, MAX_DEBUG_REGISTER): Define.
(pt_watch_style): Define new enum.
(mips32_watch_regs, mips64_watch_regs, pt_watch_regs, mips_watchpoint):
Define new structs.
(watch_readback_valid, watch_readback, current_watches, watch_mirror):
New variables.
(get_irw_mask, get_reg_mask, get_num_valid, get_watchlo)
(set_watchlo, get_watchhi, set_watchhi, mips_show_dr)
(mips_linux_read_watch_registers, mips_linux_can_use_hw_breakpoint)
(mips_linux_stopped_by_watchpoint, mips_linux_stopped_data_address)
(type_to_irw, fill_mask, try_one_watch)
(mips_linux_region_ok_for_hw_watchpoint, write_watchpoint_regs)
(mips_linux_new_thread, populate_regs_from_watches)
(mips_linux_insert_watchpoint, mips_linux_remove_watchpoint)
(mips_linux_close): New functions.
(_initialize_mips_linux_nat): Register watchpoint functions with
the target_ops. Add show-debug-regs maintenance command.
2009-04-20 David Daney <ddaney@caviumnetworks.com>
* infrun.c (handle_inferior_event): Move gegisters_changed call down.
2009-04-21 05:11:06 +08:00
|
|
|
|
registers_changed ();
|
Refactor infrun a bit.
* infrun.c (currently_stepping): Take a struct
thread_stepping_state instead of an execution_control_state.
(struct thread_stepping_state): New, split from
execution_control_state.
(gtss, tss): New globals.
(proceed): Clear the stepping state, set previous_inferior_ptid
and clear infwait state.
(init_wait_for_inferior): Clear the stepping state,
previous_inferior_ptid and infwait state.
(waiton_ptid, infwait_state): New, split from
execution_control_state.
(struct execution_control_state): Members that persist through
events moved out to either struct thred_stepping_state or made
global. Deleted unneeded wp, saved_inferior_ptid, tmpstatus.
(wait_for_inferior, fetch_inferior_event): Use local
execution_control_state. Update to execution_control_state split.
(init_execution_control_state): Adjust.
(init_thread_stepping_state): New, extracted from
init_execution_control_state.
(context_switch): Take a ptid instead of an
execution_control_state.
(context_switch_to): Adjust.
(adjust_pc_after_break): Adjust.
(init_infwait_state): New.
(handle_inferior_event): Adjust.
2008-07-10 06:33:16 +08:00
|
|
|
|
waiton_ptid = ecs->ptid;
|
2009-05-11 19:13:09 +08:00
|
|
|
|
if (target_have_steppable_watchpoint)
|
Refactor infrun a bit.
* infrun.c (currently_stepping): Take a struct
thread_stepping_state instead of an execution_control_state.
(struct thread_stepping_state): New, split from
execution_control_state.
(gtss, tss): New globals.
(proceed): Clear the stepping state, set previous_inferior_ptid
and clear infwait state.
(init_wait_for_inferior): Clear the stepping state,
previous_inferior_ptid and infwait state.
(waiton_ptid, infwait_state): New, split from
execution_control_state.
(struct execution_control_state): Members that persist through
events moved out to either struct thred_stepping_state or made
global. Deleted unneeded wp, saved_inferior_ptid, tmpstatus.
(wait_for_inferior, fetch_inferior_event): Use local
execution_control_state. Update to execution_control_state split.
(init_execution_control_state): Adjust.
(init_thread_stepping_state): New, extracted from
init_execution_control_state.
(context_switch): Take a ptid instead of an
execution_control_state.
(context_switch_to): Adjust.
(adjust_pc_after_break): Adjust.
(init_infwait_state): New.
(handle_inferior_event): Adjust.
2008-07-10 06:33:16 +08:00
|
|
|
|
infwait_state = infwait_step_watch_state;
|
2007-10-01 08:17:58 +08:00
|
|
|
|
else
|
Refactor infrun a bit.
* infrun.c (currently_stepping): Take a struct
thread_stepping_state instead of an execution_control_state.
(struct thread_stepping_state): New, split from
execution_control_state.
(gtss, tss): New globals.
(proceed): Clear the stepping state, set previous_inferior_ptid
and clear infwait state.
(init_wait_for_inferior): Clear the stepping state,
previous_inferior_ptid and infwait state.
(waiton_ptid, infwait_state): New, split from
execution_control_state.
(struct execution_control_state): Members that persist through
events moved out to either struct thred_stepping_state or made
global. Deleted unneeded wp, saved_inferior_ptid, tmpstatus.
(wait_for_inferior, fetch_inferior_event): Use local
execution_control_state. Update to execution_control_state split.
(init_execution_control_state): Adjust.
(init_thread_stepping_state): New, extracted from
init_execution_control_state.
(context_switch): Take a ptid instead of an
execution_control_state.
(context_switch_to): Adjust.
(adjust_pc_after_break): Adjust.
(init_infwait_state): New.
(handle_inferior_event): Adjust.
2008-07-10 06:33:16 +08:00
|
|
|
|
infwait_state = infwait_nonstep_watch_state;
|
2002-07-19 01:53:50 +08:00
|
|
|
|
prepare_to_wait (ecs);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ecs->stop_func_start = 0;
|
|
|
|
|
ecs->stop_func_end = 0;
|
|
|
|
|
ecs->stop_func_name = 0;
|
|
|
|
|
/* Don't care about return value; stop_func_start and stop_func_name
|
|
|
|
|
will both be 0 if it doesn't work. */
|
|
|
|
|
find_pc_partial_function (stop_pc, &ecs->stop_func_name,
|
|
|
|
|
&ecs->stop_func_start, &ecs->stop_func_end);
|
2007-06-19 02:23:08 +08:00
|
|
|
|
ecs->stop_func_start
|
|
|
|
|
+= gdbarch_deprecated_function_start_offset (current_gdbarch);
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
ecs->event_thread->stepping_over_breakpoint = 0;
|
2008-09-09 05:46:21 +08:00
|
|
|
|
bpstat_clear (&ecs->event_thread->stop_bpstat);
|
2008-09-09 05:55:16 +08:00
|
|
|
|
ecs->event_thread->stop_step = 0;
|
2002-07-19 01:53:50 +08:00
|
|
|
|
stop_print_frame = 1;
|
|
|
|
|
ecs->random_signal = 0;
|
|
|
|
|
stopped_by_random_signal = 0;
|
|
|
|
|
|
2008-09-09 05:51:18 +08:00
|
|
|
|
if (ecs->event_thread->stop_signal == TARGET_SIGNAL_TRAP
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
&& ecs->event_thread->trap_expected
|
2004-11-01 01:38:16 +08:00
|
|
|
|
&& gdbarch_single_step_through_delay_p (current_gdbarch)
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
&& currently_stepping (ecs->event_thread))
|
2004-11-01 01:38:16 +08:00
|
|
|
|
{
|
2007-12-19 13:16:36 +08:00
|
|
|
|
/* We're trying to step off a breakpoint. Turns out that we're
|
2004-11-01 01:38:16 +08:00
|
|
|
|
also on an instruction that needs to be stepped multiple
|
|
|
|
|
times before it's been fully executing. E.g., architectures
|
|
|
|
|
with a delay slot. It needs to be stepped twice, once for
|
|
|
|
|
the instruction and once for the delay slot. */
|
|
|
|
|
int step_through_delay
|
|
|
|
|
= gdbarch_single_step_through_delay (current_gdbarch,
|
|
|
|
|
get_current_frame ());
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun && step_through_delay)
|
2005-01-20 00:09:46 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: step through delay\n");
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
if (ecs->event_thread->step_range_end == 0 && step_through_delay)
|
2004-11-01 01:38:16 +08:00
|
|
|
|
{
|
|
|
|
|
/* The user issued a continue when stopped at a breakpoint.
|
|
|
|
|
Set up for another trap and get out of here. */
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
ecs->event_thread->stepping_over_breakpoint = 1;
|
2004-11-01 01:38:16 +08:00
|
|
|
|
keep_going (ecs);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
else if (step_through_delay)
|
|
|
|
|
{
|
|
|
|
|
/* The user issued a step when stopped at a breakpoint.
|
|
|
|
|
Maybe we should stop, maybe we should not - the delay
|
|
|
|
|
slot *might* correspond to a line of source. In any
|
2007-12-06 20:57:51 +08:00
|
|
|
|
case, don't decide that here, just set
|
|
|
|
|
ecs->stepping_over_breakpoint, making sure we
|
|
|
|
|
single-step again before breakpoints are re-inserted. */
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
ecs->event_thread->stepping_over_breakpoint = 1;
|
2004-11-01 01:38:16 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
/* Look at the cause of the stop, and decide what to do.
|
|
|
|
|
The alternatives are:
|
Refactor infrun a bit.
* infrun.c (currently_stepping): Take a struct
thread_stepping_state instead of an execution_control_state.
(struct thread_stepping_state): New, split from
execution_control_state.
(gtss, tss): New globals.
(proceed): Clear the stepping state, set previous_inferior_ptid
and clear infwait state.
(init_wait_for_inferior): Clear the stepping state,
previous_inferior_ptid and infwait state.
(waiton_ptid, infwait_state): New, split from
execution_control_state.
(struct execution_control_state): Members that persist through
events moved out to either struct thred_stepping_state or made
global. Deleted unneeded wp, saved_inferior_ptid, tmpstatus.
(wait_for_inferior, fetch_inferior_event): Use local
execution_control_state. Update to execution_control_state split.
(init_execution_control_state): Adjust.
(init_thread_stepping_state): New, extracted from
init_execution_control_state.
(context_switch): Take a ptid instead of an
execution_control_state.
(context_switch_to): Adjust.
(adjust_pc_after_break): Adjust.
(init_infwait_state): New.
(handle_inferior_event): Adjust.
2008-07-10 06:33:16 +08:00
|
|
|
|
1) stop_stepping and return; to really stop and return to the debugger,
|
|
|
|
|
2) keep_going and return to start up again
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
(set ecs->event_thread->stepping_over_breakpoint to 1 to single step once)
|
2002-07-19 01:53:50 +08:00
|
|
|
|
3) set ecs->random_signal to 1, and the decision between 1 and 2
|
|
|
|
|
will be made according to the signal handling tables. */
|
|
|
|
|
|
|
|
|
|
/* First, distinguish signals caused by the debugger from signals
|
2004-02-06 03:56:33 +08:00
|
|
|
|
that have to do with the program's own actions. Note that
|
|
|
|
|
breakpoint insns may cause SIGTRAP or SIGILL or SIGEMT, depending
|
|
|
|
|
on the operating system version. Here we detect when a SIGILL or
|
|
|
|
|
SIGEMT is really a breakpoint and change it to SIGTRAP. We do
|
|
|
|
|
something similar for SIGSEGV, since a SIGSEGV will be generated
|
|
|
|
|
when we're trying to execute a breakpoint instruction on a
|
|
|
|
|
non-executable stack. This happens for call dummy breakpoints
|
|
|
|
|
for architectures like SPARC that place call dummies on the
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
stack.
|
2002-07-19 01:53:50 +08:00
|
|
|
|
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
If we're doing a displaced step past a breakpoint, then the
|
|
|
|
|
breakpoint is always inserted at the original instruction;
|
|
|
|
|
non-standard signals can't be explained by the breakpoint. */
|
2008-09-09 05:51:18 +08:00
|
|
|
|
if (ecs->event_thread->stop_signal == TARGET_SIGNAL_TRAP
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
|| (! ecs->event_thread->trap_expected
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
&& breakpoint_inserted_here_p (stop_pc)
|
2008-09-09 05:51:18 +08:00
|
|
|
|
&& (ecs->event_thread->stop_signal == TARGET_SIGNAL_ILL
|
|
|
|
|
|| ecs->event_thread->stop_signal == TARGET_SIGNAL_SEGV
|
|
|
|
|
|| ecs->event_thread->stop_signal == TARGET_SIGNAL_EMT))
|
2007-07-03 05:29:28 +08:00
|
|
|
|
|| stop_soon == STOP_QUIETLY || stop_soon == STOP_QUIETLY_NO_SIGSTOP
|
|
|
|
|
|| stop_soon == STOP_QUIETLY_REMOTE)
|
2002-07-19 01:53:50 +08:00
|
|
|
|
{
|
2008-09-09 05:51:18 +08:00
|
|
|
|
if (ecs->event_thread->stop_signal == TARGET_SIGNAL_TRAP && stop_after_trap)
|
2002-07-19 01:53:50 +08:00
|
|
|
|
{
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2005-01-20 00:09:46 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: stopped\n");
|
2002-07-19 01:53:50 +08:00
|
|
|
|
stop_print_frame = 0;
|
|
|
|
|
stop_stepping (ecs);
|
|
|
|
|
return;
|
|
|
|
|
}
|
2003-04-09 02:52:04 +08:00
|
|
|
|
|
|
|
|
|
/* This is originated from start_remote(), start_inferior() and
|
|
|
|
|
shared libraries hook functions. */
|
2007-07-03 05:29:28 +08:00
|
|
|
|
if (stop_soon == STOP_QUIETLY || stop_soon == STOP_QUIETLY_REMOTE)
|
2002-07-19 01:53:50 +08:00
|
|
|
|
{
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2005-01-20 00:09:46 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: quietly stopped\n");
|
2002-07-19 01:53:50 +08:00
|
|
|
|
stop_stepping (ecs);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2003-04-09 02:52:04 +08:00
|
|
|
|
/* This originates from attach_command(). We need to overwrite
|
2008-07-12 01:46:40 +08:00
|
|
|
|
the stop_signal here, because some kernels don't ignore a
|
|
|
|
|
SIGSTOP in a subsequent ptrace(PTRACE_CONT,SIGSTOP) call.
|
|
|
|
|
See more comments in inferior.h. On the other hand, if we
|
2008-05-02 02:50:14 +08:00
|
|
|
|
get a non-SIGSTOP, report it to the user - assume the backend
|
2008-07-12 01:46:40 +08:00
|
|
|
|
will handle the SIGSTOP if it should show up later.
|
|
|
|
|
|
|
|
|
|
Also consider that the attach is complete when we see a
|
|
|
|
|
SIGTRAP. Some systems (e.g. Windows), and stubs supporting
|
|
|
|
|
target extended-remote report it instead of a SIGSTOP
|
|
|
|
|
(e.g. gdbserver). We already rely on SIGTRAP being our
|
2008-11-06 04:23:07 +08:00
|
|
|
|
signal, so this is no exception.
|
|
|
|
|
|
|
|
|
|
Also consider that the attach is complete when we see a
|
|
|
|
|
TARGET_SIGNAL_0. In non-stop mode, GDB will explicitly tell
|
|
|
|
|
the target to stop all threads of the inferior, in case the
|
|
|
|
|
low level attach operation doesn't stop them implicitly. If
|
|
|
|
|
they weren't stopped implicitly, then the stub will report a
|
|
|
|
|
TARGET_SIGNAL_0, meaning: stopped for no particular reason
|
|
|
|
|
other than GDB's request. */
|
2008-05-02 02:50:14 +08:00
|
|
|
|
if (stop_soon == STOP_QUIETLY_NO_SIGSTOP
|
2008-09-09 05:51:18 +08:00
|
|
|
|
&& (ecs->event_thread->stop_signal == TARGET_SIGNAL_STOP
|
2008-11-06 04:23:07 +08:00
|
|
|
|
|| ecs->event_thread->stop_signal == TARGET_SIGNAL_TRAP
|
|
|
|
|
|| ecs->event_thread->stop_signal == TARGET_SIGNAL_0))
|
2003-04-09 02:52:04 +08:00
|
|
|
|
{
|
|
|
|
|
stop_stepping (ecs);
|
2008-09-09 05:51:18 +08:00
|
|
|
|
ecs->event_thread->stop_signal = TARGET_SIGNAL_0;
|
2003-04-09 02:52:04 +08:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2007-11-30 18:03:16 +08:00
|
|
|
|
/* See if there is a breakpoint at the current PC. */
|
2008-09-09 05:46:21 +08:00
|
|
|
|
ecs->event_thread->stop_bpstat = bpstat_stop_status (stop_pc, ecs->ptid);
|
2007-11-30 18:03:16 +08:00
|
|
|
|
|
|
|
|
|
/* Following in case break condition called a
|
|
|
|
|
function. */
|
|
|
|
|
stop_print_frame = 1;
|
2002-07-19 01:53:50 +08:00
|
|
|
|
|
2003-04-01 22:38:51 +08:00
|
|
|
|
/* NOTE: cagney/2003-03-29: These two checks for a random signal
|
2004-08-25 22:47:07 +08:00
|
|
|
|
at one stage in the past included checks for an inferior
|
|
|
|
|
function call's call dummy's return breakpoint. The original
|
|
|
|
|
comment, that went with the test, read:
|
2003-04-01 22:38:51 +08:00
|
|
|
|
|
2004-08-25 22:47:07 +08:00
|
|
|
|
``End of a stack dummy. Some systems (e.g. Sony news) give
|
|
|
|
|
another signal besides SIGTRAP, so check here as well as
|
|
|
|
|
above.''
|
2003-04-01 22:38:51 +08:00
|
|
|
|
|
2008-10-06 03:52:11 +08:00
|
|
|
|
If someone ever tries to get call dummys on a
|
2003-04-01 22:38:51 +08:00
|
|
|
|
non-executable stack to work (where the target would stop
|
2004-02-06 03:56:33 +08:00
|
|
|
|
with something like a SIGSEGV), then those tests might need
|
|
|
|
|
to be re-instated. Given, however, that the tests were only
|
2003-04-01 22:38:51 +08:00
|
|
|
|
enabled when momentary breakpoints were not being used, I
|
2004-02-06 03:56:33 +08:00
|
|
|
|
suspect that it won't be the case.
|
|
|
|
|
|
2004-08-25 22:47:07 +08:00
|
|
|
|
NOTE: kettenis/2004-02-05: Indeed such checks don't seem to
|
|
|
|
|
be necessary for call dummies on a non-executable stack on
|
|
|
|
|
SPARC. */
|
2003-04-01 22:38:51 +08:00
|
|
|
|
|
2008-09-09 05:51:18 +08:00
|
|
|
|
if (ecs->event_thread->stop_signal == TARGET_SIGNAL_TRAP)
|
2002-07-19 01:53:50 +08:00
|
|
|
|
ecs->random_signal
|
2008-09-09 05:46:21 +08:00
|
|
|
|
= !(bpstat_explains_signal (ecs->event_thread->stop_bpstat)
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
|| ecs->event_thread->trap_expected
|
|
|
|
|
|| (ecs->event_thread->step_range_end
|
|
|
|
|
&& ecs->event_thread->step_resume_breakpoint == NULL));
|
2002-07-19 01:53:50 +08:00
|
|
|
|
else
|
|
|
|
|
{
|
2008-09-09 05:46:21 +08:00
|
|
|
|
ecs->random_signal = !bpstat_explains_signal (ecs->event_thread->stop_bpstat);
|
2002-07-19 01:53:50 +08:00
|
|
|
|
if (!ecs->random_signal)
|
2008-09-09 05:51:18 +08:00
|
|
|
|
ecs->event_thread->stop_signal = TARGET_SIGNAL_TRAP;
|
2002-07-19 01:53:50 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* When we reach this point, we've pretty much decided
|
|
|
|
|
that the reason for stopping must've been a random
|
|
|
|
|
(unexpected) signal. */
|
|
|
|
|
|
|
|
|
|
else
|
|
|
|
|
ecs->random_signal = 1;
|
|
|
|
|
|
2002-12-16 04:38:52 +08:00
|
|
|
|
process_event_stop_test:
|
2002-07-19 01:53:50 +08:00
|
|
|
|
/* For the program's own signals, act according to
|
|
|
|
|
the signal handling tables. */
|
|
|
|
|
|
|
|
|
|
if (ecs->random_signal)
|
|
|
|
|
{
|
|
|
|
|
/* Signal not for debugging purposes. */
|
|
|
|
|
int printed = 0;
|
|
|
|
|
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2008-09-09 05:51:18 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: random signal %d\n",
|
|
|
|
|
ecs->event_thread->stop_signal);
|
2004-11-09 01:25:23 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
stopped_by_random_signal = 1;
|
|
|
|
|
|
2008-09-09 05:51:18 +08:00
|
|
|
|
if (signal_print[ecs->event_thread->stop_signal])
|
2002-07-19 01:53:50 +08:00
|
|
|
|
{
|
|
|
|
|
printed = 1;
|
|
|
|
|
target_terminal_ours_for_output ();
|
2008-09-09 05:51:18 +08:00
|
|
|
|
print_stop_reason (SIGNAL_RECEIVED, ecs->event_thread->stop_signal);
|
2002-07-19 01:53:50 +08:00
|
|
|
|
}
|
2008-10-24 07:11:21 +08:00
|
|
|
|
/* Always stop on signals if we're either just gaining control
|
|
|
|
|
of the program, or the user explicitly requested this thread
|
|
|
|
|
to remain stopped. */
|
2008-09-22 23:20:08 +08:00
|
|
|
|
if (stop_soon != NO_STOP_QUIETLY
|
2008-10-24 07:11:21 +08:00
|
|
|
|
|| ecs->event_thread->stop_requested
|
2008-09-22 23:20:08 +08:00
|
|
|
|
|| signal_stop_state (ecs->event_thread->stop_signal))
|
2002-07-19 01:53:50 +08:00
|
|
|
|
{
|
|
|
|
|
stop_stepping (ecs);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
/* If not going to stop, give terminal back
|
|
|
|
|
if we took it away. */
|
|
|
|
|
else if (printed)
|
|
|
|
|
target_terminal_inferior ();
|
|
|
|
|
|
|
|
|
|
/* Clear the signal if it should not be passed. */
|
2008-09-09 05:51:18 +08:00
|
|
|
|
if (signal_program[ecs->event_thread->stop_signal] == 0)
|
|
|
|
|
ecs->event_thread->stop_signal = TARGET_SIGNAL_0;
|
2002-07-19 01:53:50 +08:00
|
|
|
|
|
2009-05-05 21:24:49 +08:00
|
|
|
|
if (ecs->event_thread->prev_pc == stop_pc
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
&& ecs->event_thread->trap_expected
|
|
|
|
|
&& ecs->event_thread->step_resume_breakpoint == NULL)
|
2004-08-31 00:59:45 +08:00
|
|
|
|
{
|
|
|
|
|
/* We were just starting a new sequence, attempting to
|
|
|
|
|
single-step off of a breakpoint and expecting a SIGTRAP.
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
Instead this signal arrives. This signal will take us out
|
2004-08-31 00:59:45 +08:00
|
|
|
|
of the stepping range so GDB needs to remember to, when
|
|
|
|
|
the signal handler returns, resume stepping off that
|
|
|
|
|
breakpoint. */
|
|
|
|
|
/* To simplify things, "continue" is forced to use the same
|
|
|
|
|
code paths as single-step - set a breakpoint at the
|
|
|
|
|
signal return address and then, once hit, step off that
|
|
|
|
|
breakpoint. */
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
if (debug_infrun)
|
|
|
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
|
|
|
"infrun: signal arrived while stepping over "
|
|
|
|
|
"breakpoint\n");
|
2007-04-13 21:29:42 +08:00
|
|
|
|
|
2004-09-28 01:58:08 +08:00
|
|
|
|
insert_step_resume_breakpoint_at_frame (get_current_frame ());
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
ecs->event_thread->step_after_step_resume_breakpoint = 1;
|
2005-01-25 06:00:59 +08:00
|
|
|
|
keep_going (ecs);
|
|
|
|
|
return;
|
2004-08-31 00:59:45 +08:00
|
|
|
|
}
|
2005-01-25 06:00:59 +08:00
|
|
|
|
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
if (ecs->event_thread->step_range_end != 0
|
2008-09-09 05:51:18 +08:00
|
|
|
|
&& ecs->event_thread->stop_signal != TARGET_SIGNAL_0
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
&& (ecs->event_thread->step_range_start <= stop_pc
|
|
|
|
|
&& stop_pc < ecs->event_thread->step_range_end)
|
2005-01-25 06:00:59 +08:00
|
|
|
|
&& frame_id_eq (get_frame_id (get_current_frame ()),
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
ecs->event_thread->step_frame_id)
|
|
|
|
|
&& ecs->event_thread->step_resume_breakpoint == NULL)
|
2004-05-11 02:36:07 +08:00
|
|
|
|
{
|
|
|
|
|
/* The inferior is about to take a signal that will take it
|
|
|
|
|
out of the single step range. Set a breakpoint at the
|
|
|
|
|
current PC (which is presumably where the signal handler
|
|
|
|
|
will eventually return) and then allow the inferior to
|
|
|
|
|
run free.
|
|
|
|
|
|
|
|
|
|
Note that this is only needed for a signal delivered
|
|
|
|
|
while in the single-step range. Nested signals aren't a
|
|
|
|
|
problem as they eventually all return. */
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
if (debug_infrun)
|
|
|
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
|
|
|
"infrun: signal may take us out of "
|
|
|
|
|
"single-step range\n");
|
|
|
|
|
|
2004-09-28 01:58:08 +08:00
|
|
|
|
insert_step_resume_breakpoint_at_frame (get_current_frame ());
|
2005-01-25 06:00:59 +08:00
|
|
|
|
keep_going (ecs);
|
|
|
|
|
return;
|
2004-05-11 02:36:07 +08:00
|
|
|
|
}
|
2005-01-25 06:00:59 +08:00
|
|
|
|
|
|
|
|
|
/* Note: step_resume_breakpoint may be non-NULL. This occures
|
|
|
|
|
when either there's a nested signal, or when there's a
|
|
|
|
|
pending signal enabled just as the signal handler returns
|
|
|
|
|
(leaving the inferior at the step-resume-breakpoint without
|
|
|
|
|
actually executing it). Either way continue until the
|
|
|
|
|
breakpoint is really hit. */
|
2002-07-19 01:53:50 +08:00
|
|
|
|
keep_going (ecs);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Handle cases caused by hitting a breakpoint. */
|
|
|
|
|
{
|
|
|
|
|
CORE_ADDR jmp_buf_pc;
|
|
|
|
|
struct bpstat_what what;
|
|
|
|
|
|
2008-09-09 05:46:21 +08:00
|
|
|
|
what = bpstat_what (ecs->event_thread->stop_bpstat);
|
2002-07-19 01:53:50 +08:00
|
|
|
|
|
|
|
|
|
if (what.call_dummy)
|
|
|
|
|
{
|
|
|
|
|
stop_stack_dummy = 1;
|
1999-07-08 04:19:36 +08:00
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
switch (what.main_action)
|
1999-07-08 04:19:36 +08:00
|
|
|
|
{
|
2002-07-19 01:53:50 +08:00
|
|
|
|
case BPSTAT_WHAT_SET_LONGJMP_RESUME:
|
2008-05-05 03:39:00 +08:00
|
|
|
|
/* If we hit the breakpoint at longjmp while stepping, we
|
|
|
|
|
install a momentary breakpoint at the target of the
|
|
|
|
|
jmp_buf. */
|
|
|
|
|
|
|
|
|
|
if (debug_infrun)
|
|
|
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
|
|
|
"infrun: BPSTAT_WHAT_SET_LONGJMP_RESUME\n");
|
|
|
|
|
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
ecs->event_thread->stepping_over_breakpoint = 1;
|
2008-05-05 03:39:00 +08:00
|
|
|
|
|
2007-06-06 23:15:34 +08:00
|
|
|
|
if (!gdbarch_get_longjmp_target_p (current_gdbarch)
|
2007-06-16 06:41:13 +08:00
|
|
|
|
|| !gdbarch_get_longjmp_target (current_gdbarch,
|
|
|
|
|
get_current_frame (), &jmp_buf_pc))
|
1999-07-08 04:19:36 +08:00
|
|
|
|
{
|
2008-05-05 03:39:00 +08:00
|
|
|
|
if (debug_infrun)
|
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "\
|
|
|
|
|
infrun: BPSTAT_WHAT_SET_LONGJMP_RESUME (!gdbarch_get_longjmp_target)\n");
|
2002-07-19 01:53:50 +08:00
|
|
|
|
keep_going (ecs);
|
1999-08-31 09:14:27 +08:00
|
|
|
|
return;
|
1999-07-08 04:19:36 +08:00
|
|
|
|
}
|
2002-07-19 01:53:50 +08:00
|
|
|
|
|
2008-05-05 03:39:00 +08:00
|
|
|
|
/* We're going to replace the current step-resume breakpoint
|
|
|
|
|
with a longjmp-resume breakpoint. */
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
delete_step_resume_breakpoint (ecs->event_thread);
|
2008-05-05 03:39:00 +08:00
|
|
|
|
|
|
|
|
|
/* Insert a breakpoint at resume address. */
|
|
|
|
|
insert_longjmp_resume_breakpoint (jmp_buf_pc);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
keep_going (ecs);
|
|
|
|
|
return;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
case BPSTAT_WHAT_CLEAR_LONGJMP_RESUME:
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2008-05-05 03:39:00 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
|
|
|
"infrun: BPSTAT_WHAT_CLEAR_LONGJMP_RESUME\n");
|
|
|
|
|
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
gdb_assert (ecs->event_thread->step_resume_breakpoint != NULL);
|
|
|
|
|
delete_step_resume_breakpoint (ecs->event_thread);
|
2008-05-05 03:39:00 +08:00
|
|
|
|
|
2008-09-09 05:55:16 +08:00
|
|
|
|
ecs->event_thread->stop_step = 1;
|
2008-05-05 03:39:00 +08:00
|
|
|
|
print_stop_reason (END_STEPPING_RANGE, 0);
|
|
|
|
|
stop_stepping (ecs);
|
|
|
|
|
return;
|
2002-07-19 01:53:50 +08:00
|
|
|
|
|
|
|
|
|
case BPSTAT_WHAT_SINGLE:
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2006-07-13 04:43:52 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: BPSTAT_WHAT_SINGLE\n");
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
ecs->event_thread->stepping_over_breakpoint = 1;
|
2002-07-19 01:53:50 +08:00
|
|
|
|
/* Still need to check other stuff, at least the case
|
|
|
|
|
where we are stepping and step out of the right range. */
|
|
|
|
|
break;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
case BPSTAT_WHAT_STOP_NOISY:
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2006-07-13 04:43:52 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: BPSTAT_WHAT_STOP_NOISY\n");
|
2002-07-19 01:53:50 +08:00
|
|
|
|
stop_print_frame = 1;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2004-05-11 02:36:07 +08:00
|
|
|
|
/* We are about to nuke the step_resume_breakpointt via the
|
|
|
|
|
cleanup chain, so no need to worry about it here. */
|
1999-07-08 04:19:36 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
stop_stepping (ecs);
|
|
|
|
|
return;
|
1999-07-08 04:19:36 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
case BPSTAT_WHAT_STOP_SILENT:
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2006-07-13 04:43:52 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: BPSTAT_WHAT_STOP_SILENT\n");
|
2002-07-19 01:53:50 +08:00
|
|
|
|
stop_print_frame = 0;
|
1999-07-08 04:19:36 +08:00
|
|
|
|
|
2004-05-11 02:36:07 +08:00
|
|
|
|
/* We are about to nuke the step_resume_breakpoin via the
|
|
|
|
|
cleanup chain, so no need to worry about it here. */
|
1999-07-08 04:19:36 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
stop_stepping (ecs);
|
2000-05-05 01:32:49 +08:00
|
|
|
|
return;
|
1999-07-08 04:19:36 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
case BPSTAT_WHAT_STEP_RESUME:
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2006-07-13 04:43:52 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: BPSTAT_WHAT_STEP_RESUME\n");
|
2004-11-09 01:25:23 +08:00
|
|
|
|
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
delete_step_resume_breakpoint (ecs->event_thread);
|
|
|
|
|
if (ecs->event_thread->step_after_step_resume_breakpoint)
|
2004-08-31 00:59:45 +08:00
|
|
|
|
{
|
|
|
|
|
/* Back when the step-resume breakpoint was inserted, we
|
|
|
|
|
were trying to single-step off a breakpoint. Go back
|
|
|
|
|
to doing that. */
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
ecs->event_thread->step_after_step_resume_breakpoint = 0;
|
|
|
|
|
ecs->event_thread->stepping_over_breakpoint = 1;
|
2004-08-31 00:59:45 +08:00
|
|
|
|
keep_going (ecs);
|
|
|
|
|
return;
|
|
|
|
|
}
|
2008-10-18 03:43:47 +08:00
|
|
|
|
if (stop_pc == ecs->stop_func_start
|
|
|
|
|
&& execution_direction == EXEC_REVERSE)
|
|
|
|
|
{
|
|
|
|
|
/* We are stepping over a function call in reverse, and
|
|
|
|
|
just hit the step-resume breakpoint at the start
|
|
|
|
|
address of the function. Go back to single-stepping,
|
|
|
|
|
which should take us back to the function call. */
|
|
|
|
|
ecs->event_thread->stepping_over_breakpoint = 1;
|
|
|
|
|
keep_going (ecs);
|
|
|
|
|
return;
|
|
|
|
|
}
|
2002-07-19 01:53:50 +08:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case BPSTAT_WHAT_CHECK_SHLIBS:
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2006-07-13 04:43:52 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: BPSTAT_WHAT_CHECK_SHLIBS\n");
|
2002-07-19 01:53:50 +08:00
|
|
|
|
|
|
|
|
|
/* Check for any newly added shared libraries if we're
|
|
|
|
|
supposed to be adding them automatically. Switch
|
|
|
|
|
terminal for any messages produced by
|
|
|
|
|
breakpoint_re_set. */
|
|
|
|
|
target_terminal_ours_for_output ();
|
2003-11-26 00:01:36 +08:00
|
|
|
|
/* NOTE: cagney/2003-11-25: Make certain that the target
|
2004-08-25 22:47:07 +08:00
|
|
|
|
stack's section table is kept up-to-date. Architectures,
|
|
|
|
|
(e.g., PPC64), use the section table to perform
|
|
|
|
|
operations such as address => section name and hence
|
|
|
|
|
require the table to contain all sections (including
|
|
|
|
|
those found in shared libraries). */
|
* solib.h (CLEAR_SOLIB, SOLIB_ADD)
(SOLIB_CREATE_INFERIOR_HOOK, SOLIB_REMOVE_INFERIOR_HOOK)
(SOLIB_IN_DYNAMIC_LINKER, SOLIB_RESTART)
(DISABLE_UNSETTABLE_BREAK, PC_SOLIB)
(IN_SOLIB_DYNSYM_RESOLVE_CODE): Remove defines and orphaned
comments.
* breakpoint.c: Include "solib.h".
(insert_bp_location) [!DISABLE_UNSETTABLE_BREAK]: Call
solib_address.
(remove_solib_event_breakpoints, create_solib_event_breakpoint)
(disable_breakpoints_in_shlibs)
(disable_breakpoints_in_unloaded_shlib)
(re_enable_breakpoints_in_shlibs): Compile if SOLIB_ADD isn't
defined. If PC_SOLIB isn't defined, call solib_address.
(_initialize_breakpoint): Unconditionally install observer.
* corelow.c: Include "solib.h".
[SOLIB_ADD] (solib_add_stub): Remove prototype.
(core_close) [!CLEAR_SOLIB]: Call clear_solib.
(solib_add_stub) [!SOLIB_ADD] Call solib_add.
(core_open): Unconditionally call solib_add_stub.
* fork-child.c: Include "solib.h".
(fork_inferior) [!SOLIB_CREATE_INFERIOR_HOOK]: Call
solib_create_inferior_hook.
* infcmd.c: Include "solib.h".
(attach_command) [!SOLIB_ADD]: Call shlib_rescan. Unconditionally
call re_enable_breakpoints_in_shlibs.
* infrun.c: Include "solib.h".
(SOLIB_IN_SYNSYM_RESOLVE_CODE): Don't define if not already
defined.
(stop_on_solib_events, show_stop_on_solib_events): Include
unconditionally.
(follow_exec) [!SOLIB_CREATE_INFERIOR_HOOK]: Call
solib_create_inferior_hook.
(handle_inferior_event) [!SOLIB_ADD]: Call shlib_add.
[!IN_SOLIB_DYNSYM_RESOLVE_CODE]: Call in_solib_dynsym_resolve_code.
(_initialize_infrun): Unconditionally add "stop_on_solib-events"
command.
* remote.c: Include "solib.h".
(remote_open_1): Unconditionally call no_shared_libraries.
[!SOLIB_CREATE_INFERIOR_HOOK] Call solib_create_inferior_hook.
* stack.c: Include "solib.h".
(print_frame) [!PC_SOLIB] Call shlib_for_pc.
* xcoffsolib.c (no_shared_libraries): Remove function.
* Makefile.in (SFILES): Add solib.c.
(ALLDEPFILES): Remove solib.c.
(COMMON_OBS): Add solib.o.
(breakpoint.o, corelow.o, fork-chiled.o, infcmd.o, infrun.o)
(remote.o, stack.o): Update dependencies.
2005-05-13 04:21:18 +08:00
|
|
|
|
#ifdef SOLIB_ADD
|
2003-11-26 00:01:36 +08:00
|
|
|
|
SOLIB_ADD (NULL, 0, ¤t_target, auto_solib_add);
|
* solib.h (CLEAR_SOLIB, SOLIB_ADD)
(SOLIB_CREATE_INFERIOR_HOOK, SOLIB_REMOVE_INFERIOR_HOOK)
(SOLIB_IN_DYNAMIC_LINKER, SOLIB_RESTART)
(DISABLE_UNSETTABLE_BREAK, PC_SOLIB)
(IN_SOLIB_DYNSYM_RESOLVE_CODE): Remove defines and orphaned
comments.
* breakpoint.c: Include "solib.h".
(insert_bp_location) [!DISABLE_UNSETTABLE_BREAK]: Call
solib_address.
(remove_solib_event_breakpoints, create_solib_event_breakpoint)
(disable_breakpoints_in_shlibs)
(disable_breakpoints_in_unloaded_shlib)
(re_enable_breakpoints_in_shlibs): Compile if SOLIB_ADD isn't
defined. If PC_SOLIB isn't defined, call solib_address.
(_initialize_breakpoint): Unconditionally install observer.
* corelow.c: Include "solib.h".
[SOLIB_ADD] (solib_add_stub): Remove prototype.
(core_close) [!CLEAR_SOLIB]: Call clear_solib.
(solib_add_stub) [!SOLIB_ADD] Call solib_add.
(core_open): Unconditionally call solib_add_stub.
* fork-child.c: Include "solib.h".
(fork_inferior) [!SOLIB_CREATE_INFERIOR_HOOK]: Call
solib_create_inferior_hook.
* infcmd.c: Include "solib.h".
(attach_command) [!SOLIB_ADD]: Call shlib_rescan. Unconditionally
call re_enable_breakpoints_in_shlibs.
* infrun.c: Include "solib.h".
(SOLIB_IN_SYNSYM_RESOLVE_CODE): Don't define if not already
defined.
(stop_on_solib_events, show_stop_on_solib_events): Include
unconditionally.
(follow_exec) [!SOLIB_CREATE_INFERIOR_HOOK]: Call
solib_create_inferior_hook.
(handle_inferior_event) [!SOLIB_ADD]: Call shlib_add.
[!IN_SOLIB_DYNSYM_RESOLVE_CODE]: Call in_solib_dynsym_resolve_code.
(_initialize_infrun): Unconditionally add "stop_on_solib-events"
command.
* remote.c: Include "solib.h".
(remote_open_1): Unconditionally call no_shared_libraries.
[!SOLIB_CREATE_INFERIOR_HOOK] Call solib_create_inferior_hook.
* stack.c: Include "solib.h".
(print_frame) [!PC_SOLIB] Call shlib_for_pc.
* xcoffsolib.c (no_shared_libraries): Remove function.
* Makefile.in (SFILES): Add solib.c.
(ALLDEPFILES): Remove solib.c.
(COMMON_OBS): Add solib.o.
(breakpoint.o, corelow.o, fork-chiled.o, infcmd.o, infrun.o)
(remote.o, stack.o): Update dependencies.
2005-05-13 04:21:18 +08:00
|
|
|
|
#else
|
|
|
|
|
solib_add (NULL, 0, ¤t_target, auto_solib_add);
|
|
|
|
|
#endif
|
2002-07-19 01:53:50 +08:00
|
|
|
|
target_terminal_inferior ();
|
|
|
|
|
|
|
|
|
|
/* If requested, stop when the dynamic linker notifies
|
|
|
|
|
gdb of events. This allows the user to get control
|
|
|
|
|
and place breakpoints in initializer routines for
|
|
|
|
|
dynamically loaded objects (among other things). */
|
2004-01-22 00:32:07 +08:00
|
|
|
|
if (stop_on_solib_events || stop_stack_dummy)
|
1999-09-09 08:02:17 +08:00
|
|
|
|
{
|
2002-07-19 01:53:50 +08:00
|
|
|
|
stop_stepping (ecs);
|
1999-09-09 08:02:17 +08:00
|
|
|
|
return;
|
|
|
|
|
}
|
1999-07-08 04:19:36 +08:00
|
|
|
|
else
|
|
|
|
|
{
|
2002-07-19 01:53:50 +08:00
|
|
|
|
/* We want to step over this breakpoint, then keep going. */
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
ecs->event_thread->stepping_over_breakpoint = 1;
|
2002-07-19 01:53:50 +08:00
|
|
|
|
break;
|
1999-07-08 04:19:36 +08:00
|
|
|
|
}
|
2002-07-19 01:53:50 +08:00
|
|
|
|
}
|
|
|
|
|
break;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
case BPSTAT_WHAT_LAST:
|
|
|
|
|
/* Not a real code, but listed here to shut up gcc -Wall. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
case BPSTAT_WHAT_KEEP_CHECKING:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
/* We come here if we hit a breakpoint but should not
|
|
|
|
|
stop for it. Possibly we also were stepping
|
|
|
|
|
and should stop for that. So fall through and
|
|
|
|
|
test for stepping. But, if not stepping,
|
|
|
|
|
do not stop. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2008-11-18 02:50:22 +08:00
|
|
|
|
/* In all-stop mode, if we're currently stepping but have stopped in
|
|
|
|
|
some other thread, we need to switch back to the stepped thread. */
|
|
|
|
|
if (!non_stop)
|
|
|
|
|
{
|
|
|
|
|
struct thread_info *tp;
|
2009-05-29 01:19:58 +08:00
|
|
|
|
tp = iterate_over_threads (currently_stepping_or_nexting_callback,
|
2008-11-18 02:50:22 +08:00
|
|
|
|
ecs->event_thread);
|
|
|
|
|
if (tp)
|
|
|
|
|
{
|
|
|
|
|
/* However, if the current thread is blocked on some internal
|
|
|
|
|
breakpoint, and we simply need to step over that breakpoint
|
|
|
|
|
to get it going again, do that first. */
|
|
|
|
|
if ((ecs->event_thread->trap_expected
|
|
|
|
|
&& ecs->event_thread->stop_signal != TARGET_SIGNAL_TRAP)
|
|
|
|
|
|| ecs->event_thread->stepping_over_breakpoint)
|
|
|
|
|
{
|
|
|
|
|
keep_going (ecs);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2009-05-29 01:19:58 +08:00
|
|
|
|
/* If the stepping thread exited, then don't try reverting
|
|
|
|
|
back to it, just keep going. We need to query the target
|
|
|
|
|
in case it doesn't support thread exit events. */
|
|
|
|
|
if (is_exited (tp->ptid)
|
|
|
|
|
|| !target_thread_alive (tp->ptid))
|
|
|
|
|
{
|
|
|
|
|
if (debug_infrun)
|
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "\
|
|
|
|
|
infrun: not switching back to stepped thread, it has vanished\n");
|
|
|
|
|
|
|
|
|
|
delete_thread (tp->ptid);
|
|
|
|
|
keep_going (ecs);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2008-11-18 02:50:22 +08:00
|
|
|
|
/* Otherwise, we no longer expect a trap in the current thread.
|
|
|
|
|
Clear the trap_expected flag before switching back -- this is
|
|
|
|
|
what keep_going would do as well, if we called it. */
|
|
|
|
|
ecs->event_thread->trap_expected = 0;
|
|
|
|
|
|
|
|
|
|
if (debug_infrun)
|
|
|
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
|
|
|
"infrun: switching back to stepped thread\n");
|
|
|
|
|
|
|
|
|
|
ecs->event_thread = tp;
|
|
|
|
|
ecs->ptid = tp->ptid;
|
|
|
|
|
context_switch (ecs->ptid);
|
|
|
|
|
keep_going (ecs);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2005-01-14 08:51:43 +08:00
|
|
|
|
/* Are we stepping to get the inferior out of the dynamic linker's
|
|
|
|
|
hook (and possibly the dld itself) after catching a shlib
|
|
|
|
|
event? */
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
if (ecs->event_thread->stepping_through_solib_after_catch)
|
2002-07-19 01:53:50 +08:00
|
|
|
|
{
|
|
|
|
|
#if defined(SOLIB_ADD)
|
|
|
|
|
/* Have we reached our destination? If not, keep going. */
|
|
|
|
|
if (SOLIB_IN_DYNAMIC_LINKER (PIDGET (ecs->ptid), stop_pc))
|
|
|
|
|
{
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2005-01-20 00:09:46 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: stepping in dynamic linker\n");
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
ecs->event_thread->stepping_over_breakpoint = 1;
|
2002-07-19 01:53:50 +08:00
|
|
|
|
keep_going (ecs);
|
1999-08-31 09:14:27 +08:00
|
|
|
|
return;
|
2002-07-19 01:53:50 +08:00
|
|
|
|
}
|
|
|
|
|
#endif
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2005-01-20 00:09:46 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: step past dynamic linker\n");
|
2002-07-19 01:53:50 +08:00
|
|
|
|
/* Else, stop and report the catchpoint(s) whose triggering
|
|
|
|
|
caused us to begin stepping. */
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
ecs->event_thread->stepping_through_solib_after_catch = 0;
|
2008-09-09 05:46:21 +08:00
|
|
|
|
bpstat_clear (&ecs->event_thread->stop_bpstat);
|
|
|
|
|
ecs->event_thread->stop_bpstat
|
|
|
|
|
= bpstat_copy (ecs->event_thread->stepping_through_solib_catchpoints);
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
bpstat_clear (&ecs->event_thread->stepping_through_solib_catchpoints);
|
2002-07-19 01:53:50 +08:00
|
|
|
|
stop_print_frame = 1;
|
|
|
|
|
stop_stepping (ecs);
|
|
|
|
|
return;
|
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
if (ecs->event_thread->step_resume_breakpoint)
|
2002-07-19 01:53:50 +08:00
|
|
|
|
{
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2007-04-13 21:29:42 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
|
|
|
"infrun: step-resume breakpoint is inserted\n");
|
2004-11-09 01:25:23 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
/* Having a step-resume breakpoint overrides anything
|
|
|
|
|
else having to do with stepping commands until
|
|
|
|
|
that breakpoint is reached. */
|
|
|
|
|
keep_going (ecs);
|
|
|
|
|
return;
|
|
|
|
|
}
|
1999-07-08 04:19:36 +08:00
|
|
|
|
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
if (ecs->event_thread->step_range_end == 0)
|
2002-07-19 01:53:50 +08:00
|
|
|
|
{
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2005-01-20 00:09:46 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: no stepping, continue\n");
|
2002-07-19 01:53:50 +08:00
|
|
|
|
/* Likewise if we aren't even stepping. */
|
|
|
|
|
keep_going (ecs);
|
|
|
|
|
return;
|
|
|
|
|
}
|
1999-07-08 04:19:36 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
/* If stepping through a line, keep going if still within it.
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
Note that step_range_end is the address of the first instruction
|
|
|
|
|
beyond the step range, and NOT the address of the last instruction
|
|
|
|
|
within it! */
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
if (stop_pc >= ecs->event_thread->step_range_start
|
|
|
|
|
&& stop_pc < ecs->event_thread->step_range_end)
|
2002-07-19 01:53:50 +08:00
|
|
|
|
{
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2008-10-18 03:43:47 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: stepping inside range [0x%s-0x%s]\n",
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
paddr_nz (ecs->event_thread->step_range_start),
|
|
|
|
|
paddr_nz (ecs->event_thread->step_range_end));
|
2008-10-18 03:43:47 +08:00
|
|
|
|
|
|
|
|
|
/* When stepping backward, stop at beginning of line range
|
|
|
|
|
(unless it's the function entry point, in which case
|
|
|
|
|
keep going back to the call point). */
|
|
|
|
|
if (stop_pc == ecs->event_thread->step_range_start
|
|
|
|
|
&& stop_pc != ecs->stop_func_start
|
|
|
|
|
&& execution_direction == EXEC_REVERSE)
|
|
|
|
|
{
|
|
|
|
|
ecs->event_thread->stop_step = 1;
|
|
|
|
|
print_stop_reason (END_STEPPING_RANGE, 0);
|
|
|
|
|
stop_stepping (ecs);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
keep_going (ecs);
|
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
return;
|
|
|
|
|
}
|
1999-07-08 04:19:36 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
/* We stepped out of the stepping range. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
/* If we are stepping at the source level and entered the runtime
|
|
|
|
|
loader dynamic symbol resolution code, we keep on single stepping
|
|
|
|
|
until we exit the run time loader code and reach the callee's
|
|
|
|
|
address. */
|
2008-09-09 05:43:00 +08:00
|
|
|
|
if (ecs->event_thread->step_over_calls == STEP_OVER_UNDEBUGGABLE
|
2008-07-22 10:10:14 +08:00
|
|
|
|
&& in_solib_dynsym_resolve_code (stop_pc))
|
2002-07-19 01:53:50 +08:00
|
|
|
|
{
|
2003-11-15 05:22:42 +08:00
|
|
|
|
CORE_ADDR pc_after_resolver =
|
|
|
|
|
gdbarch_skip_solib_resolver (current_gdbarch, stop_pc);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2005-01-20 00:09:46 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: stepped into dynsym resolve code\n");
|
2004-11-09 01:25:23 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
if (pc_after_resolver)
|
|
|
|
|
{
|
|
|
|
|
/* Set up a step-resume breakpoint at the address
|
|
|
|
|
indicated by SKIP_SOLIB_RESOLVER. */
|
|
|
|
|
struct symtab_and_line sr_sal;
|
2002-10-25 05:02:53 +08:00
|
|
|
|
init_sal (&sr_sal);
|
2002-07-19 01:53:50 +08:00
|
|
|
|
sr_sal.pc = pc_after_resolver;
|
|
|
|
|
|
2004-09-28 01:58:08 +08:00
|
|
|
|
insert_step_resume_breakpoint_at_sal (sr_sal, null_frame_id);
|
1999-07-08 04:19:36 +08:00
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
keep_going (ecs);
|
|
|
|
|
return;
|
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
if (ecs->event_thread->step_range_end != 1
|
2008-09-09 05:43:00 +08:00
|
|
|
|
&& (ecs->event_thread->step_over_calls == STEP_OVER_UNDEBUGGABLE
|
|
|
|
|
|| ecs->event_thread->step_over_calls == STEP_OVER_ALL)
|
2004-05-12 00:57:04 +08:00
|
|
|
|
&& get_frame_type (get_current_frame ()) == SIGTRAMP_FRAME)
|
2002-07-19 01:53:50 +08:00
|
|
|
|
{
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2005-01-20 00:09:46 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: stepped into signal trampoline\n");
|
2004-05-12 00:57:04 +08:00
|
|
|
|
/* The inferior, while doing a "step" or "next", has ended up in
|
2004-08-25 22:47:07 +08:00
|
|
|
|
a signal trampoline (either by a signal being delivered or by
|
|
|
|
|
the signal handler returning). Just single-step until the
|
|
|
|
|
inferior leaves the trampoline (either by calling the handler
|
|
|
|
|
or returning). */
|
2002-07-19 01:53:50 +08:00
|
|
|
|
keep_going (ecs);
|
|
|
|
|
return;
|
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2006-08-19 11:19:00 +08:00
|
|
|
|
/* Check for subroutine calls. The check for the current frame
|
|
|
|
|
equalling the step ID is not necessary - the check of the
|
|
|
|
|
previous frame's ID is sufficient - but it is a common case and
|
|
|
|
|
cheaper than checking the previous frame's ID.
|
2006-06-16 09:12:58 +08:00
|
|
|
|
|
|
|
|
|
NOTE: frame_id_eq will never report two invalid frame IDs as
|
|
|
|
|
being equal, so to get into this block, both the current and
|
|
|
|
|
previous frame must have valid frame IDs. */
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
if (!frame_id_eq (get_frame_id (get_current_frame ()),
|
|
|
|
|
ecs->event_thread->step_frame_id)
|
2008-10-18 03:43:47 +08:00
|
|
|
|
&& (frame_id_eq (frame_unwind_id (get_current_frame ()),
|
|
|
|
|
ecs->event_thread->step_frame_id)
|
|
|
|
|
|| execution_direction == EXEC_REVERSE))
|
2002-07-19 01:53:50 +08:00
|
|
|
|
{
|
2004-05-14 23:49:00 +08:00
|
|
|
|
CORE_ADDR real_stop_pc;
|
2004-08-25 22:47:07 +08:00
|
|
|
|
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2005-01-20 00:09:46 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: stepped into subroutine\n");
|
2004-11-09 01:25:23 +08:00
|
|
|
|
|
2008-09-09 05:43:00 +08:00
|
|
|
|
if ((ecs->event_thread->step_over_calls == STEP_OVER_NONE)
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
|| ((ecs->event_thread->step_range_end == 1)
|
|
|
|
|
&& in_prologue (ecs->event_thread->prev_pc,
|
|
|
|
|
ecs->stop_func_start)))
|
2004-05-14 23:49:00 +08:00
|
|
|
|
{
|
|
|
|
|
/* I presume that step_over_calls is only 0 when we're
|
|
|
|
|
supposed to be stepping at the assembly language level
|
|
|
|
|
("stepi"). Just stop. */
|
|
|
|
|
/* Also, maybe we just did a "nexti" inside a prolog, so we
|
|
|
|
|
thought it was a subroutine call but it was not. Stop as
|
|
|
|
|
well. FENN */
|
2008-09-09 05:55:16 +08:00
|
|
|
|
ecs->event_thread->stop_step = 1;
|
2004-05-14 23:49:00 +08:00
|
|
|
|
print_stop_reason (END_STEPPING_RANGE, 0);
|
|
|
|
|
stop_stepping (ecs);
|
|
|
|
|
return;
|
|
|
|
|
}
|
2004-08-25 22:47:07 +08:00
|
|
|
|
|
2008-09-09 05:43:00 +08:00
|
|
|
|
if (ecs->event_thread->step_over_calls == STEP_OVER_ALL)
|
2004-07-24 03:37:21 +08:00
|
|
|
|
{
|
2008-10-18 03:43:47 +08:00
|
|
|
|
/* We're doing a "next".
|
|
|
|
|
|
|
|
|
|
Normal (forward) execution: set a breakpoint at the
|
|
|
|
|
callee's return address (the address at which the caller
|
|
|
|
|
will resume).
|
|
|
|
|
|
|
|
|
|
Reverse (backward) execution. set the step-resume
|
|
|
|
|
breakpoint at the start of the function that we just
|
|
|
|
|
stepped into (backwards), and continue to there. When we
|
2008-10-26 00:03:14 +08:00
|
|
|
|
get there, we'll need to single-step back to the caller. */
|
2008-10-18 03:43:47 +08:00
|
|
|
|
|
|
|
|
|
if (execution_direction == EXEC_REVERSE)
|
|
|
|
|
{
|
|
|
|
|
struct symtab_and_line sr_sal;
|
2008-10-27 12:53:05 +08:00
|
|
|
|
|
|
|
|
|
if (ecs->stop_func_start == 0
|
|
|
|
|
&& in_solib_dynsym_resolve_code (stop_pc))
|
|
|
|
|
{
|
|
|
|
|
/* Stepped into runtime loader dynamic symbol
|
|
|
|
|
resolution code. Since we're in reverse,
|
|
|
|
|
we have already backed up through the runtime
|
|
|
|
|
loader and the dynamic function. This is just
|
|
|
|
|
the trampoline (jump table).
|
|
|
|
|
|
|
|
|
|
Just keep stepping, we'll soon be home.
|
|
|
|
|
*/
|
|
|
|
|
keep_going (ecs);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
/* Normal (staticly linked) function call return. */
|
2008-10-18 03:43:47 +08:00
|
|
|
|
init_sal (&sr_sal);
|
|
|
|
|
sr_sal.pc = ecs->stop_func_start;
|
|
|
|
|
insert_step_resume_breakpoint_at_sal (sr_sal, null_frame_id);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
insert_step_resume_breakpoint_at_caller (get_current_frame ());
|
|
|
|
|
|
2004-07-24 03:37:21 +08:00
|
|
|
|
keep_going (ecs);
|
|
|
|
|
return;
|
|
|
|
|
}
|
2004-07-21 22:23:37 +08:00
|
|
|
|
|
2004-05-14 23:49:00 +08:00
|
|
|
|
/* If we are in a function call trampoline (a stub between the
|
2004-08-25 22:47:07 +08:00
|
|
|
|
calling routine and the real function), locate the real
|
|
|
|
|
function. That's what tells us (a) whether we want to step
|
|
|
|
|
into it at all, and (b) what prologue we want to run to the
|
|
|
|
|
end of, if we do step into it. */
|
2007-06-16 06:39:52 +08:00
|
|
|
|
real_stop_pc = skip_language_trampoline (get_current_frame (), stop_pc);
|
2004-05-14 23:49:00 +08:00
|
|
|
|
if (real_stop_pc == 0)
|
2007-06-16 06:39:52 +08:00
|
|
|
|
real_stop_pc = gdbarch_skip_trampoline_code
|
|
|
|
|
(current_gdbarch, get_current_frame (), stop_pc);
|
2004-05-14 23:49:00 +08:00
|
|
|
|
if (real_stop_pc != 0)
|
|
|
|
|
ecs->stop_func_start = real_stop_pc;
|
2004-08-25 22:47:07 +08:00
|
|
|
|
|
2008-10-02 23:48:06 +08:00
|
|
|
|
if (real_stop_pc != 0 && in_solib_dynsym_resolve_code (real_stop_pc))
|
2004-06-12 07:39:51 +08:00
|
|
|
|
{
|
|
|
|
|
struct symtab_and_line sr_sal;
|
|
|
|
|
init_sal (&sr_sal);
|
|
|
|
|
sr_sal.pc = ecs->stop_func_start;
|
|
|
|
|
|
2004-09-28 01:58:08 +08:00
|
|
|
|
insert_step_resume_breakpoint_at_sal (sr_sal, null_frame_id);
|
2004-08-25 22:47:07 +08:00
|
|
|
|
keep_going (ecs);
|
|
|
|
|
return;
|
2004-06-12 07:39:51 +08:00
|
|
|
|
}
|
|
|
|
|
|
2004-05-14 23:49:00 +08:00
|
|
|
|
/* If we have line number information for the function we are
|
2004-08-25 22:47:07 +08:00
|
|
|
|
thinking of stepping into, step into it.
|
2004-05-14 23:49:00 +08:00
|
|
|
|
|
2004-08-25 22:47:07 +08:00
|
|
|
|
If there are several symtabs at that PC (e.g. with include
|
|
|
|
|
files), just want to know whether *any* of them have line
|
|
|
|
|
numbers. find_pc_line handles this. */
|
2004-05-14 23:49:00 +08:00
|
|
|
|
{
|
|
|
|
|
struct symtab_and_line tmp_sal;
|
2004-08-25 22:47:07 +08:00
|
|
|
|
|
2004-05-14 23:49:00 +08:00
|
|
|
|
tmp_sal = find_pc_line (ecs->stop_func_start, 0);
|
|
|
|
|
if (tmp_sal.line != 0)
|
|
|
|
|
{
|
2008-10-18 03:43:47 +08:00
|
|
|
|
if (execution_direction == EXEC_REVERSE)
|
|
|
|
|
handle_step_into_function_backward (ecs);
|
|
|
|
|
else
|
|
|
|
|
handle_step_into_function (ecs);
|
2004-05-14 23:49:00 +08:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If we have no line number and the step-stop-if-no-debug is
|
2004-08-25 22:47:07 +08:00
|
|
|
|
set, we stop the step so that the user has a chance to switch
|
|
|
|
|
in assembly mode. */
|
2008-09-09 05:43:00 +08:00
|
|
|
|
if (ecs->event_thread->step_over_calls == STEP_OVER_UNDEBUGGABLE
|
|
|
|
|
&& step_stop_if_no_debug)
|
2004-05-14 23:49:00 +08:00
|
|
|
|
{
|
2008-09-09 05:55:16 +08:00
|
|
|
|
ecs->event_thread->stop_step = 1;
|
2004-05-14 23:49:00 +08:00
|
|
|
|
print_stop_reason (END_STEPPING_RANGE, 0);
|
|
|
|
|
stop_stepping (ecs);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2008-10-18 03:43:47 +08:00
|
|
|
|
if (execution_direction == EXEC_REVERSE)
|
|
|
|
|
{
|
|
|
|
|
/* Set a breakpoint at callee's start address.
|
|
|
|
|
From there we can step once and be back in the caller. */
|
|
|
|
|
struct symtab_and_line sr_sal;
|
|
|
|
|
init_sal (&sr_sal);
|
|
|
|
|
sr_sal.pc = ecs->stop_func_start;
|
|
|
|
|
insert_step_resume_breakpoint_at_sal (sr_sal, null_frame_id);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
/* Set a breakpoint at callee's return address (the address
|
|
|
|
|
at which the caller will resume). */
|
|
|
|
|
insert_step_resume_breakpoint_at_caller (get_current_frame ());
|
|
|
|
|
|
2004-05-14 23:49:00 +08:00
|
|
|
|
keep_going (ecs);
|
2002-07-19 01:53:50 +08:00
|
|
|
|
return;
|
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
/* If we're in the return path from a shared library trampoline,
|
|
|
|
|
we want to proceed through the trampoline when stepping. */
|
2007-06-09 22:20:24 +08:00
|
|
|
|
if (gdbarch_in_solib_return_trampoline (current_gdbarch,
|
|
|
|
|
stop_pc, ecs->stop_func_name))
|
2002-07-19 01:53:50 +08:00
|
|
|
|
{
|
|
|
|
|
/* Determine where this trampoline returns. */
|
2007-06-16 06:39:52 +08:00
|
|
|
|
CORE_ADDR real_stop_pc;
|
|
|
|
|
real_stop_pc = gdbarch_skip_trampoline_code
|
|
|
|
|
(current_gdbarch, get_current_frame (), stop_pc);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2005-01-20 00:09:46 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: stepped into solib return tramp\n");
|
2004-11-09 01:25:23 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
/* Only proceed through if we know where it's going. */
|
2003-01-31 23:22:57 +08:00
|
|
|
|
if (real_stop_pc)
|
2002-07-19 01:53:50 +08:00
|
|
|
|
{
|
|
|
|
|
/* And put the step-breakpoint there and go until there. */
|
|
|
|
|
struct symtab_and_line sr_sal;
|
|
|
|
|
|
2002-10-25 05:02:53 +08:00
|
|
|
|
init_sal (&sr_sal); /* initialize to zeroes */
|
2003-01-31 23:22:57 +08:00
|
|
|
|
sr_sal.pc = real_stop_pc;
|
2002-07-19 01:53:50 +08:00
|
|
|
|
sr_sal.section = find_pc_overlay (sr_sal.pc);
|
2004-09-28 01:58:08 +08:00
|
|
|
|
|
|
|
|
|
/* Do not specify what the fp should be when we stop since
|
|
|
|
|
on some machines the prologue is where the new fp value
|
|
|
|
|
is established. */
|
|
|
|
|
insert_step_resume_breakpoint_at_sal (sr_sal, null_frame_id);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
/* Restart without fiddling with the step ranges or
|
|
|
|
|
other state. */
|
|
|
|
|
keep_going (ecs);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2008-07-13 02:39:10 +08:00
|
|
|
|
stop_pc_sal = find_pc_line (stop_pc, 0);
|
2005-08-01 11:32:32 +08:00
|
|
|
|
|
2004-06-12 07:39:51 +08:00
|
|
|
|
/* NOTE: tausq/2004-05-24: This if block used to be done before all
|
|
|
|
|
the trampoline processing logic, however, there are some trampolines
|
|
|
|
|
that have no names, so we should do trampoline handling first. */
|
2008-09-09 05:43:00 +08:00
|
|
|
|
if (ecs->event_thread->step_over_calls == STEP_OVER_UNDEBUGGABLE
|
2005-08-01 11:32:32 +08:00
|
|
|
|
&& ecs->stop_func_name == NULL
|
2008-07-13 02:39:10 +08:00
|
|
|
|
&& stop_pc_sal.line == 0)
|
2004-06-12 07:39:51 +08:00
|
|
|
|
{
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2005-01-20 00:09:46 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: stepped into undebuggable function\n");
|
2004-11-09 01:25:23 +08:00
|
|
|
|
|
2004-06-12 07:39:51 +08:00
|
|
|
|
/* The inferior just stepped into, or returned to, an
|
2005-08-01 11:32:32 +08:00
|
|
|
|
undebuggable function (where there is no debugging information
|
|
|
|
|
and no line number corresponding to the address where the
|
2004-06-12 07:39:51 +08:00
|
|
|
|
inferior stopped). Since we want to skip this kind of code,
|
|
|
|
|
we keep going until the inferior returns from this
|
2006-06-16 09:12:58 +08:00
|
|
|
|
function - unless the user has asked us not to (via
|
|
|
|
|
set step-mode) or we no longer know how to get back
|
|
|
|
|
to the call site. */
|
|
|
|
|
if (step_stop_if_no_debug
|
2008-07-16 07:29:24 +08:00
|
|
|
|
|| !frame_id_p (frame_unwind_id (get_current_frame ())))
|
2004-06-12 07:39:51 +08:00
|
|
|
|
{
|
|
|
|
|
/* If we have no line number and the step-stop-if-no-debug
|
|
|
|
|
is set, we stop the step so that the user has a chance to
|
|
|
|
|
switch in assembly mode. */
|
2008-09-09 05:55:16 +08:00
|
|
|
|
ecs->event_thread->stop_step = 1;
|
2004-06-12 07:39:51 +08:00
|
|
|
|
print_stop_reason (END_STEPPING_RANGE, 0);
|
|
|
|
|
stop_stepping (ecs);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Set a breakpoint at callee's return address (the address
|
|
|
|
|
at which the caller will resume). */
|
2006-06-16 09:12:58 +08:00
|
|
|
|
insert_step_resume_breakpoint_at_caller (get_current_frame ());
|
2004-06-12 07:39:51 +08:00
|
|
|
|
keep_going (ecs);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
if (ecs->event_thread->step_range_end == 1)
|
2004-06-12 07:39:51 +08:00
|
|
|
|
{
|
|
|
|
|
/* It is stepi or nexti. We always want to stop stepping after
|
|
|
|
|
one instruction. */
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2005-01-20 00:09:46 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: stepi/nexti\n");
|
2008-09-09 05:55:16 +08:00
|
|
|
|
ecs->event_thread->stop_step = 1;
|
2004-06-12 07:39:51 +08:00
|
|
|
|
print_stop_reason (END_STEPPING_RANGE, 0);
|
|
|
|
|
stop_stepping (ecs);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2008-07-13 02:39:10 +08:00
|
|
|
|
if (stop_pc_sal.line == 0)
|
2002-07-19 01:53:50 +08:00
|
|
|
|
{
|
|
|
|
|
/* We have no line number information. That means to stop
|
|
|
|
|
stepping (does this always happen right after one instruction,
|
|
|
|
|
when we do "s" in a function with no line numbers,
|
|
|
|
|
or can this happen as a result of a return or longjmp?). */
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2005-01-20 00:09:46 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: no line number info\n");
|
2008-09-09 05:55:16 +08:00
|
|
|
|
ecs->event_thread->stop_step = 1;
|
2002-07-19 01:53:50 +08:00
|
|
|
|
print_stop_reason (END_STEPPING_RANGE, 0);
|
|
|
|
|
stop_stepping (ecs);
|
|
|
|
|
return;
|
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2008-07-13 02:39:10 +08:00
|
|
|
|
if ((stop_pc == stop_pc_sal.pc)
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
&& (ecs->event_thread->current_line != stop_pc_sal.line
|
|
|
|
|
|| ecs->event_thread->current_symtab != stop_pc_sal.symtab))
|
2002-07-19 01:53:50 +08:00
|
|
|
|
{
|
|
|
|
|
/* We are at the start of a different line. So stop. Note that
|
|
|
|
|
we don't stop if we step into the middle of a different line.
|
|
|
|
|
That is said to make things like for (;;) statements work
|
|
|
|
|
better. */
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2005-01-20 00:09:46 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: stepped to a different line\n");
|
2008-09-09 05:55:16 +08:00
|
|
|
|
ecs->event_thread->stop_step = 1;
|
2002-07-19 01:53:50 +08:00
|
|
|
|
print_stop_reason (END_STEPPING_RANGE, 0);
|
|
|
|
|
stop_stepping (ecs);
|
|
|
|
|
return;
|
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
/* We aren't done stepping.
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
Optimize by setting the stepping range to the line.
|
|
|
|
|
(We might not be in the original line, but if we entered a
|
|
|
|
|
new line in mid-statement, we continue stepping. This makes
|
|
|
|
|
things like for(;;) statements work better.) */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
ecs->event_thread->step_range_start = stop_pc_sal.pc;
|
|
|
|
|
ecs->event_thread->step_range_end = stop_pc_sal.end;
|
|
|
|
|
ecs->event_thread->step_frame_id = get_frame_id (get_current_frame ());
|
|
|
|
|
ecs->event_thread->current_line = stop_pc_sal.line;
|
|
|
|
|
ecs->event_thread->current_symtab = stop_pc_sal.symtab;
|
2002-07-19 01:53:50 +08:00
|
|
|
|
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2005-01-20 00:09:46 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: keep going\n");
|
2002-07-19 01:53:50 +08:00
|
|
|
|
keep_going (ecs);
|
1999-08-31 09:14:27 +08:00
|
|
|
|
}
|
|
|
|
|
|
2009-05-29 01:19:58 +08:00
|
|
|
|
/* Is thread TP in the middle of single-stepping? */
|
1999-08-31 09:14:27 +08:00
|
|
|
|
|
2008-11-18 02:50:22 +08:00
|
|
|
|
static int
|
2009-05-29 01:19:58 +08:00
|
|
|
|
currently_stepping (struct thread_info *tp)
|
2008-11-18 02:50:22 +08:00
|
|
|
|
{
|
2009-05-29 01:19:58 +08:00
|
|
|
|
return ((tp->step_range_end && tp->step_resume_breakpoint == NULL)
|
|
|
|
|
|| tp->trap_expected
|
|
|
|
|
|| tp->stepping_through_solib_after_catch
|
|
|
|
|
|| bpstat_should_step ());
|
2008-11-18 02:50:22 +08:00
|
|
|
|
}
|
|
|
|
|
|
2009-05-29 01:19:58 +08:00
|
|
|
|
/* Returns true if any thread *but* the one passed in "data" is in the
|
|
|
|
|
middle of stepping or of handling a "next". */
|
2008-11-18 02:50:22 +08:00
|
|
|
|
|
1999-08-31 09:14:27 +08:00
|
|
|
|
static int
|
2009-05-29 01:19:58 +08:00
|
|
|
|
currently_stepping_or_nexting_callback (struct thread_info *tp, void *data)
|
1999-08-31 09:14:27 +08:00
|
|
|
|
{
|
2009-05-29 01:19:58 +08:00
|
|
|
|
if (tp == data)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
return (tp->step_range_end
|
|
|
|
|
|| tp->trap_expected
|
|
|
|
|
|| tp->stepping_through_solib_after_catch);
|
1999-08-31 09:14:27 +08:00
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2008-10-18 03:43:47 +08:00
|
|
|
|
/* Inferior has stepped into a subroutine call with source code that
|
|
|
|
|
we should not step over. Do step to the first line of code in
|
|
|
|
|
it. */
|
1999-09-22 11:28:34 +08:00
|
|
|
|
|
|
|
|
|
static void
|
2008-10-18 03:43:47 +08:00
|
|
|
|
handle_step_into_function (struct execution_control_state *ecs)
|
1999-09-22 11:28:34 +08:00
|
|
|
|
{
|
|
|
|
|
struct symtab *s;
|
2008-07-13 02:39:10 +08:00
|
|
|
|
struct symtab_and_line stop_func_sal, sr_sal;
|
1999-09-22 11:28:34 +08:00
|
|
|
|
|
|
|
|
|
s = find_pc_symtab (stop_pc);
|
|
|
|
|
if (s && s->language != language_asm)
|
2008-10-18 03:43:47 +08:00
|
|
|
|
ecs->stop_func_start = gdbarch_skip_prologue (current_gdbarch,
|
|
|
|
|
ecs->stop_func_start);
|
1999-09-22 11:28:34 +08:00
|
|
|
|
|
2008-07-13 02:39:10 +08:00
|
|
|
|
stop_func_sal = find_pc_line (ecs->stop_func_start, 0);
|
1999-09-22 11:28:34 +08:00
|
|
|
|
/* Use the step_resume_break to step until the end of the prologue,
|
|
|
|
|
even if that involves jumps (as it seems to on the vax under
|
|
|
|
|
4.2). */
|
|
|
|
|
/* If the prologue ends in the middle of a source line, continue to
|
|
|
|
|
the end of that source line (if it is still within the function).
|
|
|
|
|
Otherwise, just go to end of prologue. */
|
2008-07-13 02:39:10 +08:00
|
|
|
|
if (stop_func_sal.end
|
|
|
|
|
&& stop_func_sal.pc != ecs->stop_func_start
|
|
|
|
|
&& stop_func_sal.end < ecs->stop_func_end)
|
|
|
|
|
ecs->stop_func_start = stop_func_sal.end;
|
1999-09-22 11:28:34 +08:00
|
|
|
|
|
2004-01-20 01:28:52 +08:00
|
|
|
|
/* Architectures which require breakpoint adjustment might not be able
|
|
|
|
|
to place a breakpoint at the computed address. If so, the test
|
|
|
|
|
``ecs->stop_func_start == stop_pc'' will never succeed. Adjust
|
|
|
|
|
ecs->stop_func_start to an address at which a breakpoint may be
|
|
|
|
|
legitimately placed.
|
2004-08-25 22:47:07 +08:00
|
|
|
|
|
2004-01-20 01:28:52 +08:00
|
|
|
|
Note: kevinb/2004-01-19: On FR-V, if this adjustment is not
|
|
|
|
|
made, GDB will enter an infinite loop when stepping through
|
|
|
|
|
optimized code consisting of VLIW instructions which contain
|
|
|
|
|
subinstructions corresponding to different source lines. On
|
|
|
|
|
FR-V, it's not permitted to place a breakpoint on any but the
|
|
|
|
|
first subinstruction of a VLIW instruction. When a breakpoint is
|
|
|
|
|
set, GDB will adjust the breakpoint address to the beginning of
|
|
|
|
|
the VLIW instruction. Thus, we need to make the corresponding
|
|
|
|
|
adjustment here when computing the stop address. */
|
2004-08-25 22:47:07 +08:00
|
|
|
|
|
2004-01-20 01:28:52 +08:00
|
|
|
|
if (gdbarch_adjust_breakpoint_address_p (current_gdbarch))
|
|
|
|
|
{
|
|
|
|
|
ecs->stop_func_start
|
|
|
|
|
= gdbarch_adjust_breakpoint_address (current_gdbarch,
|
2004-08-25 22:47:07 +08:00
|
|
|
|
ecs->stop_func_start);
|
2004-01-20 01:28:52 +08:00
|
|
|
|
}
|
|
|
|
|
|
1999-09-22 11:28:34 +08:00
|
|
|
|
if (ecs->stop_func_start == stop_pc)
|
|
|
|
|
{
|
|
|
|
|
/* We are already there: stop now. */
|
2008-09-09 05:55:16 +08:00
|
|
|
|
ecs->event_thread->stop_step = 1;
|
2002-07-19 01:53:50 +08:00
|
|
|
|
print_stop_reason (END_STEPPING_RANGE, 0);
|
1999-09-22 11:28:34 +08:00
|
|
|
|
stop_stepping (ecs);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Put the step-breakpoint there and go until there. */
|
2002-10-25 05:02:53 +08:00
|
|
|
|
init_sal (&sr_sal); /* initialize to zeroes */
|
1999-09-22 11:28:34 +08:00
|
|
|
|
sr_sal.pc = ecs->stop_func_start;
|
|
|
|
|
sr_sal.section = find_pc_overlay (ecs->stop_func_start);
|
2004-09-28 01:58:08 +08:00
|
|
|
|
|
1999-09-22 11:28:34 +08:00
|
|
|
|
/* Do not specify what the fp should be when we stop since on
|
2002-07-19 01:53:50 +08:00
|
|
|
|
some machines the prologue is where the new fp value is
|
|
|
|
|
established. */
|
2004-09-28 01:58:08 +08:00
|
|
|
|
insert_step_resume_breakpoint_at_sal (sr_sal, null_frame_id);
|
1999-09-22 11:28:34 +08:00
|
|
|
|
|
|
|
|
|
/* And make sure stepping stops right away then. */
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
ecs->event_thread->step_range_end = ecs->event_thread->step_range_start;
|
1999-09-22 11:28:34 +08:00
|
|
|
|
}
|
|
|
|
|
keep_going (ecs);
|
|
|
|
|
}
|
1999-09-09 08:02:17 +08:00
|
|
|
|
|
2008-10-18 03:43:47 +08:00
|
|
|
|
/* Inferior has stepped backward into a subroutine call with source
|
|
|
|
|
code that we should not step over. Do step to the beginning of the
|
|
|
|
|
last line of code in it. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
handle_step_into_function_backward (struct execution_control_state *ecs)
|
|
|
|
|
{
|
|
|
|
|
struct symtab *s;
|
|
|
|
|
struct symtab_and_line stop_func_sal, sr_sal;
|
|
|
|
|
|
|
|
|
|
s = find_pc_symtab (stop_pc);
|
|
|
|
|
if (s && s->language != language_asm)
|
|
|
|
|
ecs->stop_func_start = gdbarch_skip_prologue (current_gdbarch,
|
|
|
|
|
ecs->stop_func_start);
|
|
|
|
|
|
|
|
|
|
stop_func_sal = find_pc_line (stop_pc, 0);
|
|
|
|
|
|
|
|
|
|
/* OK, we're just going to keep stepping here. */
|
|
|
|
|
if (stop_func_sal.pc == stop_pc)
|
|
|
|
|
{
|
|
|
|
|
/* We're there already. Just stop stepping now. */
|
|
|
|
|
ecs->event_thread->stop_step = 1;
|
|
|
|
|
print_stop_reason (END_STEPPING_RANGE, 0);
|
|
|
|
|
stop_stepping (ecs);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Else just reset the step range and keep going.
|
|
|
|
|
No step-resume breakpoint, they don't work for
|
|
|
|
|
epilogues, which can have multiple entry paths. */
|
|
|
|
|
ecs->event_thread->step_range_start = stop_func_sal.pc;
|
|
|
|
|
ecs->event_thread->step_range_end = stop_func_sal.end;
|
|
|
|
|
keep_going (ecs);
|
|
|
|
|
}
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2007-04-13 21:29:42 +08:00
|
|
|
|
/* Insert a "step-resume breakpoint" at SR_SAL with frame ID SR_ID.
|
2004-09-28 01:58:08 +08:00
|
|
|
|
This is used to both functions and to skip over code. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
insert_step_resume_breakpoint_at_sal (struct symtab_and_line sr_sal,
|
|
|
|
|
struct frame_id sr_id)
|
|
|
|
|
{
|
2008-05-05 03:39:00 +08:00
|
|
|
|
/* There should never be more than one step-resume or longjmp-resume
|
|
|
|
|
breakpoint per thread, so we should never be setting a new
|
2004-09-28 01:58:08 +08:00
|
|
|
|
step_resume_breakpoint when one is already active. */
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
gdb_assert (inferior_thread ()->step_resume_breakpoint == NULL);
|
2007-04-13 21:29:42 +08:00
|
|
|
|
|
|
|
|
|
if (debug_infrun)
|
|
|
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
|
|
|
"infrun: inserting step-resume breakpoint at 0x%s\n",
|
|
|
|
|
paddr_nz (sr_sal.pc));
|
|
|
|
|
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
inferior_thread ()->step_resume_breakpoint
|
|
|
|
|
= set_momentary_breakpoint (sr_sal, sr_id, bp_step_resume);
|
2004-09-28 01:58:08 +08:00
|
|
|
|
}
|
2004-07-17 03:41:48 +08:00
|
|
|
|
|
2007-04-13 21:29:42 +08:00
|
|
|
|
/* Insert a "step-resume breakpoint" at RETURN_FRAME.pc. This is used
|
2006-06-16 09:12:58 +08:00
|
|
|
|
to skip a potential signal handler.
|
2004-07-17 03:41:48 +08:00
|
|
|
|
|
2006-06-16 09:12:58 +08:00
|
|
|
|
This is called with the interrupted function's frame. The signal
|
|
|
|
|
handler, when it returns, will resume the interrupted function at
|
|
|
|
|
RETURN_FRAME.pc. */
|
2004-05-11 02:36:07 +08:00
|
|
|
|
|
|
|
|
|
static void
|
2004-09-28 01:58:08 +08:00
|
|
|
|
insert_step_resume_breakpoint_at_frame (struct frame_info *return_frame)
|
2004-05-11 02:36:07 +08:00
|
|
|
|
{
|
|
|
|
|
struct symtab_and_line sr_sal;
|
|
|
|
|
|
2007-09-18 03:44:20 +08:00
|
|
|
|
gdb_assert (return_frame != NULL);
|
2004-05-11 02:36:07 +08:00
|
|
|
|
init_sal (&sr_sal); /* initialize to zeros */
|
|
|
|
|
|
2007-06-09 21:49:20 +08:00
|
|
|
|
sr_sal.pc = gdbarch_addr_bits_remove
|
|
|
|
|
(current_gdbarch, get_frame_pc (return_frame));
|
2004-05-11 02:36:07 +08:00
|
|
|
|
sr_sal.section = find_pc_overlay (sr_sal.pc);
|
|
|
|
|
|
2004-09-28 01:58:08 +08:00
|
|
|
|
insert_step_resume_breakpoint_at_sal (sr_sal, get_frame_id (return_frame));
|
2004-05-11 02:36:07 +08:00
|
|
|
|
}
|
|
|
|
|
|
2006-06-16 09:12:58 +08:00
|
|
|
|
/* Similar to insert_step_resume_breakpoint_at_frame, except
|
|
|
|
|
but a breakpoint at the previous frame's PC. This is used to
|
|
|
|
|
skip a function after stepping into it (for "next" or if the called
|
|
|
|
|
function has no debugging information).
|
|
|
|
|
|
|
|
|
|
The current function has almost always been reached by single
|
|
|
|
|
stepping a call or return instruction. NEXT_FRAME belongs to the
|
|
|
|
|
current function, and the breakpoint will be set at the caller's
|
|
|
|
|
resume address.
|
|
|
|
|
|
|
|
|
|
This is a separate function rather than reusing
|
|
|
|
|
insert_step_resume_breakpoint_at_frame in order to avoid
|
|
|
|
|
get_prev_frame, which may stop prematurely (see the implementation
|
2008-07-16 07:29:24 +08:00
|
|
|
|
of frame_unwind_id for an example). */
|
2006-06-16 09:12:58 +08:00
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
insert_step_resume_breakpoint_at_caller (struct frame_info *next_frame)
|
|
|
|
|
{
|
|
|
|
|
struct symtab_and_line sr_sal;
|
|
|
|
|
|
|
|
|
|
/* We shouldn't have gotten here if we don't know where the call site
|
|
|
|
|
is. */
|
2008-07-16 07:29:24 +08:00
|
|
|
|
gdb_assert (frame_id_p (frame_unwind_id (next_frame)));
|
2006-06-16 09:12:58 +08:00
|
|
|
|
|
|
|
|
|
init_sal (&sr_sal); /* initialize to zeros */
|
|
|
|
|
|
2007-06-09 21:49:20 +08:00
|
|
|
|
sr_sal.pc = gdbarch_addr_bits_remove
|
2008-07-16 07:29:24 +08:00
|
|
|
|
(current_gdbarch, frame_pc_unwind (next_frame));
|
2006-06-16 09:12:58 +08:00
|
|
|
|
sr_sal.section = find_pc_overlay (sr_sal.pc);
|
|
|
|
|
|
2008-07-16 07:29:24 +08:00
|
|
|
|
insert_step_resume_breakpoint_at_sal (sr_sal, frame_unwind_id (next_frame));
|
2006-06-16 09:12:58 +08:00
|
|
|
|
}
|
|
|
|
|
|
2008-05-05 03:39:00 +08:00
|
|
|
|
/* Insert a "longjmp-resume" breakpoint at PC. This is used to set a
|
|
|
|
|
new breakpoint at the target of a jmp_buf. The handling of
|
|
|
|
|
longjmp-resume uses the same mechanisms used for handling
|
|
|
|
|
"step-resume" breakpoints. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
insert_longjmp_resume_breakpoint (CORE_ADDR pc)
|
|
|
|
|
{
|
|
|
|
|
/* There should never be more than one step-resume or longjmp-resume
|
|
|
|
|
breakpoint per thread, so we should never be setting a new
|
|
|
|
|
longjmp_resume_breakpoint when one is already active. */
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
gdb_assert (inferior_thread ()->step_resume_breakpoint == NULL);
|
2008-05-05 03:39:00 +08:00
|
|
|
|
|
|
|
|
|
if (debug_infrun)
|
|
|
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
|
|
|
"infrun: inserting longjmp-resume breakpoint at 0x%s\n",
|
|
|
|
|
paddr_nz (pc));
|
|
|
|
|
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
inferior_thread ()->step_resume_breakpoint =
|
2008-05-05 03:39:00 +08:00
|
|
|
|
set_momentary_breakpoint_at_pc (pc, bp_longjmp_resume);
|
|
|
|
|
}
|
|
|
|
|
|
1999-08-31 09:14:27 +08:00
|
|
|
|
static void
|
|
|
|
|
stop_stepping (struct execution_control_state *ecs)
|
|
|
|
|
{
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2005-01-20 00:09:46 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: stop_stepping\n");
|
2004-11-09 01:25:23 +08:00
|
|
|
|
|
1999-05-11 21:35:55 +08:00
|
|
|
|
/* Let callers know we don't want to wait for the inferior anymore. */
|
|
|
|
|
ecs->wait_some_more = 0;
|
|
|
|
|
}
|
|
|
|
|
|
1999-09-09 08:02:17 +08:00
|
|
|
|
/* This function handles various cases where we need to continue
|
|
|
|
|
waiting for the inferior. */
|
|
|
|
|
/* (Used to be the keep_going: label in the old wait_for_inferior) */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
keep_going (struct execution_control_state *ecs)
|
|
|
|
|
{
|
|
|
|
|
/* Save the pc before execution, to compare with pc after stop. */
|
2009-05-05 21:24:49 +08:00
|
|
|
|
ecs->event_thread->prev_pc
|
|
|
|
|
= regcache_read_pc (get_thread_regcache (ecs->ptid));
|
1999-09-09 08:02:17 +08:00
|
|
|
|
|
|
|
|
|
/* If we did not do break;, it means we should keep running the
|
|
|
|
|
inferior and not return to debugger. */
|
|
|
|
|
|
2008-09-09 05:51:18 +08:00
|
|
|
|
if (ecs->event_thread->trap_expected
|
|
|
|
|
&& ecs->event_thread->stop_signal != TARGET_SIGNAL_TRAP)
|
1999-09-09 08:02:17 +08:00
|
|
|
|
{
|
|
|
|
|
/* We took a signal (which we are supposed to pass through to
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
the inferior, else we'd not get here) and we haven't yet
|
|
|
|
|
gotten our trap. Simply continue. */
|
2008-09-09 05:51:18 +08:00
|
|
|
|
resume (currently_stepping (ecs->event_thread),
|
|
|
|
|
ecs->event_thread->stop_signal);
|
1999-09-09 08:02:17 +08:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Either the trap was not expected, but we are continuing
|
2002-07-19 01:53:50 +08:00
|
|
|
|
anyway (the user asked that this signal be passed to the
|
|
|
|
|
child)
|
|
|
|
|
-- or --
|
|
|
|
|
The signal was SIGTRAP, e.g. it was our signal, but we
|
|
|
|
|
decided we should resume from it.
|
1999-09-09 08:02:17 +08:00
|
|
|
|
|
2007-11-29 15:48:21 +08:00
|
|
|
|
We're going to run this baby now!
|
1999-09-09 08:02:17 +08:00
|
|
|
|
|
2007-11-29 15:48:21 +08:00
|
|
|
|
Note that insert_breakpoints won't try to re-insert
|
|
|
|
|
already inserted breakpoints. Therefore, we don't
|
|
|
|
|
care if breakpoints were already inserted, or not. */
|
|
|
|
|
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
if (ecs->event_thread->stepping_over_breakpoint)
|
2007-12-06 21:47:56 +08:00
|
|
|
|
{
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
if (! use_displaced_stepping (current_gdbarch))
|
|
|
|
|
/* Since we can't do a displaced step, we have to remove
|
|
|
|
|
the breakpoint while we step it. To keep things
|
|
|
|
|
simple, we remove them all. */
|
|
|
|
|
remove_breakpoints ();
|
2007-12-06 21:47:56 +08:00
|
|
|
|
}
|
|
|
|
|
else
|
1999-09-09 08:02:17 +08:00
|
|
|
|
{
|
2007-11-30 18:00:26 +08:00
|
|
|
|
struct gdb_exception e;
|
2007-03-10 00:20:42 +08:00
|
|
|
|
/* Stop stepping when inserting breakpoints
|
|
|
|
|
has failed. */
|
2007-11-30 18:00:26 +08:00
|
|
|
|
TRY_CATCH (e, RETURN_MASK_ERROR)
|
|
|
|
|
{
|
|
|
|
|
insert_breakpoints ();
|
|
|
|
|
}
|
|
|
|
|
if (e.reason < 0)
|
1999-09-09 08:02:17 +08:00
|
|
|
|
{
|
|
|
|
|
stop_stepping (ecs);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
ecs->event_thread->trap_expected = ecs->event_thread->stepping_over_breakpoint;
|
1999-09-09 08:02:17 +08:00
|
|
|
|
|
|
|
|
|
/* Do not deliver SIGNAL_TRAP (except when the user explicitly
|
2002-07-19 01:53:50 +08:00
|
|
|
|
specifies that such a signal should be delivered to the
|
|
|
|
|
target program).
|
|
|
|
|
|
|
|
|
|
Typically, this would occure when a user is debugging a
|
|
|
|
|
target monitor on a simulator: the target monitor sets a
|
|
|
|
|
breakpoint; the simulator encounters this break-point and
|
|
|
|
|
halts the simulation handing control to GDB; GDB, noteing
|
|
|
|
|
that the break-point isn't valid, returns control back to the
|
|
|
|
|
simulator; the simulator then delivers the hardware
|
|
|
|
|
equivalent of a SIGNAL_TRAP to the program being debugged. */
|
|
|
|
|
|
2008-09-09 05:51:18 +08:00
|
|
|
|
if (ecs->event_thread->stop_signal == TARGET_SIGNAL_TRAP
|
|
|
|
|
&& !signal_program[ecs->event_thread->stop_signal])
|
|
|
|
|
ecs->event_thread->stop_signal = TARGET_SIGNAL_0;
|
1999-09-09 08:02:17 +08:00
|
|
|
|
|
2008-09-09 05:51:18 +08:00
|
|
|
|
resume (currently_stepping (ecs->event_thread),
|
|
|
|
|
ecs->event_thread->stop_signal);
|
1999-09-09 08:02:17 +08:00
|
|
|
|
}
|
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
prepare_to_wait (ecs);
|
1999-09-09 08:02:17 +08:00
|
|
|
|
}
|
|
|
|
|
|
1999-08-31 09:14:27 +08:00
|
|
|
|
/* This function normally comes after a resume, before
|
|
|
|
|
handle_inferior_event exits. It takes care of any last bits of
|
|
|
|
|
housekeeping, and sets the all-important wait_some_more flag. */
|
1999-05-11 21:35:55 +08:00
|
|
|
|
|
1999-08-31 09:14:27 +08:00
|
|
|
|
static void
|
|
|
|
|
prepare_to_wait (struct execution_control_state *ecs)
|
1999-05-11 21:35:55 +08:00
|
|
|
|
{
|
2004-11-09 01:25:23 +08:00
|
|
|
|
if (debug_infrun)
|
2005-01-20 00:09:46 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "infrun: prepare_to_wait\n");
|
Refactor infrun a bit.
* infrun.c (currently_stepping): Take a struct
thread_stepping_state instead of an execution_control_state.
(struct thread_stepping_state): New, split from
execution_control_state.
(gtss, tss): New globals.
(proceed): Clear the stepping state, set previous_inferior_ptid
and clear infwait state.
(init_wait_for_inferior): Clear the stepping state,
previous_inferior_ptid and infwait state.
(waiton_ptid, infwait_state): New, split from
execution_control_state.
(struct execution_control_state): Members that persist through
events moved out to either struct thred_stepping_state or made
global. Deleted unneeded wp, saved_inferior_ptid, tmpstatus.
(wait_for_inferior, fetch_inferior_event): Use local
execution_control_state. Update to execution_control_state split.
(init_execution_control_state): Adjust.
(init_thread_stepping_state): New, extracted from
init_execution_control_state.
(context_switch): Take a ptid instead of an
execution_control_state.
(context_switch_to): Adjust.
(adjust_pc_after_break): Adjust.
(init_infwait_state): New.
(handle_inferior_event): Adjust.
2008-07-10 06:33:16 +08:00
|
|
|
|
if (infwait_state == infwait_normal_state)
|
1999-08-31 09:14:27 +08:00
|
|
|
|
{
|
|
|
|
|
overlay_cache_invalid = 1;
|
|
|
|
|
|
|
|
|
|
/* We have to invalidate the registers BEFORE calling
|
2002-07-19 01:53:50 +08:00
|
|
|
|
target_wait because they can be loaded from the target while
|
|
|
|
|
in target_wait. This makes remote debugging a bit more
|
|
|
|
|
efficient for those targets that provide critical registers
|
|
|
|
|
as part of their normal status mechanism. */
|
1999-08-31 09:14:27 +08:00
|
|
|
|
|
|
|
|
|
registers_changed ();
|
Refactor infrun a bit.
* infrun.c (currently_stepping): Take a struct
thread_stepping_state instead of an execution_control_state.
(struct thread_stepping_state): New, split from
execution_control_state.
(gtss, tss): New globals.
(proceed): Clear the stepping state, set previous_inferior_ptid
and clear infwait state.
(init_wait_for_inferior): Clear the stepping state,
previous_inferior_ptid and infwait state.
(waiton_ptid, infwait_state): New, split from
execution_control_state.
(struct execution_control_state): Members that persist through
events moved out to either struct thred_stepping_state or made
global. Deleted unneeded wp, saved_inferior_ptid, tmpstatus.
(wait_for_inferior, fetch_inferior_event): Use local
execution_control_state. Update to execution_control_state split.
(init_execution_control_state): Adjust.
(init_thread_stepping_state): New, extracted from
init_execution_control_state.
(context_switch): Take a ptid instead of an
execution_control_state.
(context_switch_to): Adjust.
(adjust_pc_after_break): Adjust.
(init_infwait_state): New.
(handle_inferior_event): Adjust.
2008-07-10 06:33:16 +08:00
|
|
|
|
waiton_ptid = pid_to_ptid (-1);
|
1999-08-31 09:14:27 +08:00
|
|
|
|
}
|
|
|
|
|
/* This is the old end of the while loop. Let everybody know we
|
|
|
|
|
want to wait for the inferior some more and get called again
|
|
|
|
|
soon. */
|
|
|
|
|
ecs->wait_some_more = 1;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
1999-11-09 09:23:30 +08:00
|
|
|
|
|
|
|
|
|
/* Print why the inferior has stopped. We always print something when
|
|
|
|
|
the inferior exits, or receives a signal. The rest of the cases are
|
|
|
|
|
dealt with later on in normal_stop() and print_it_typical(). Ideally
|
|
|
|
|
there should be a call to this function from handle_inferior_event()
|
|
|
|
|
each time stop_stepping() is called.*/
|
|
|
|
|
static void
|
|
|
|
|
print_stop_reason (enum inferior_stop_reason stop_reason, int stop_info)
|
|
|
|
|
{
|
|
|
|
|
switch (stop_reason)
|
|
|
|
|
{
|
|
|
|
|
case END_STEPPING_RANGE:
|
|
|
|
|
/* We are done with a step/next/si/ni command. */
|
|
|
|
|
/* For now print nothing. */
|
2000-02-23 08:25:43 +08:00
|
|
|
|
/* Print a message only if not in the middle of doing a "step n"
|
2002-07-19 01:53:50 +08:00
|
|
|
|
operation for n > 1 */
|
2008-09-09 05:55:16 +08:00
|
|
|
|
if (!inferior_thread ()->step_multi
|
|
|
|
|
|| !inferior_thread ()->stop_step)
|
2001-07-06 11:53:11 +08:00
|
|
|
|
if (ui_out_is_mi_like_p (uiout))
|
2005-05-29 11:13:19 +08:00
|
|
|
|
ui_out_field_string
|
|
|
|
|
(uiout, "reason",
|
|
|
|
|
async_reason_lookup (EXEC_ASYNC_END_STEPPING_RANGE));
|
1999-11-09 09:23:30 +08:00
|
|
|
|
break;
|
|
|
|
|
case SIGNAL_EXITED:
|
|
|
|
|
/* The inferior was terminated by a signal. */
|
2000-02-03 12:14:45 +08:00
|
|
|
|
annotate_signalled ();
|
2001-07-06 11:53:11 +08:00
|
|
|
|
if (ui_out_is_mi_like_p (uiout))
|
2005-05-29 11:13:19 +08:00
|
|
|
|
ui_out_field_string
|
|
|
|
|
(uiout, "reason",
|
|
|
|
|
async_reason_lookup (EXEC_ASYNC_EXITED_SIGNALLED));
|
2000-02-03 12:14:45 +08:00
|
|
|
|
ui_out_text (uiout, "\nProgram terminated with signal ");
|
|
|
|
|
annotate_signal_name ();
|
2002-07-19 01:53:50 +08:00
|
|
|
|
ui_out_field_string (uiout, "signal-name",
|
|
|
|
|
target_signal_to_name (stop_info));
|
2000-02-03 12:14:45 +08:00
|
|
|
|
annotate_signal_name_end ();
|
|
|
|
|
ui_out_text (uiout, ", ");
|
|
|
|
|
annotate_signal_string ();
|
2002-07-19 01:53:50 +08:00
|
|
|
|
ui_out_field_string (uiout, "signal-meaning",
|
|
|
|
|
target_signal_to_string (stop_info));
|
2000-02-03 12:14:45 +08:00
|
|
|
|
annotate_signal_string_end ();
|
|
|
|
|
ui_out_text (uiout, ".\n");
|
|
|
|
|
ui_out_text (uiout, "The program no longer exists.\n");
|
1999-11-09 09:23:30 +08:00
|
|
|
|
break;
|
|
|
|
|
case EXITED:
|
|
|
|
|
/* The inferior program is finished. */
|
2000-02-03 12:14:45 +08:00
|
|
|
|
annotate_exited (stop_info);
|
|
|
|
|
if (stop_info)
|
|
|
|
|
{
|
2001-07-06 11:53:11 +08:00
|
|
|
|
if (ui_out_is_mi_like_p (uiout))
|
2005-05-29 11:13:19 +08:00
|
|
|
|
ui_out_field_string (uiout, "reason",
|
|
|
|
|
async_reason_lookup (EXEC_ASYNC_EXITED));
|
2000-02-03 12:14:45 +08:00
|
|
|
|
ui_out_text (uiout, "\nProgram exited with code ");
|
2002-07-19 01:53:50 +08:00
|
|
|
|
ui_out_field_fmt (uiout, "exit-code", "0%o",
|
|
|
|
|
(unsigned int) stop_info);
|
2000-02-03 12:14:45 +08:00
|
|
|
|
ui_out_text (uiout, ".\n");
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2001-07-06 11:53:11 +08:00
|
|
|
|
if (ui_out_is_mi_like_p (uiout))
|
2005-05-29 11:13:19 +08:00
|
|
|
|
ui_out_field_string
|
|
|
|
|
(uiout, "reason",
|
|
|
|
|
async_reason_lookup (EXEC_ASYNC_EXITED_NORMALLY));
|
2000-02-03 12:14:45 +08:00
|
|
|
|
ui_out_text (uiout, "\nProgram exited normally.\n");
|
|
|
|
|
}
|
2005-11-07 23:27:07 +08:00
|
|
|
|
/* Support the --return-child-result option. */
|
|
|
|
|
return_child_result_value = stop_info;
|
1999-11-09 09:23:30 +08:00
|
|
|
|
break;
|
|
|
|
|
case SIGNAL_RECEIVED:
|
2008-10-24 07:11:21 +08:00
|
|
|
|
/* Signal received. The signal table tells us to print about
|
|
|
|
|
it. */
|
2000-02-03 12:14:45 +08:00
|
|
|
|
annotate_signal ();
|
2008-10-24 07:11:21 +08:00
|
|
|
|
|
|
|
|
|
if (stop_info == TARGET_SIGNAL_0 && !ui_out_is_mi_like_p (uiout))
|
|
|
|
|
{
|
|
|
|
|
struct thread_info *t = inferior_thread ();
|
|
|
|
|
|
|
|
|
|
ui_out_text (uiout, "\n[");
|
|
|
|
|
ui_out_field_string (uiout, "thread-name",
|
|
|
|
|
target_pid_to_str (t->ptid));
|
|
|
|
|
ui_out_field_fmt (uiout, "thread-id", "] #%d", t->num);
|
|
|
|
|
ui_out_text (uiout, " stopped");
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
ui_out_text (uiout, "\nProgram received signal ");
|
|
|
|
|
annotate_signal_name ();
|
|
|
|
|
if (ui_out_is_mi_like_p (uiout))
|
|
|
|
|
ui_out_field_string
|
|
|
|
|
(uiout, "reason", async_reason_lookup (EXEC_ASYNC_SIGNAL_RECEIVED));
|
|
|
|
|
ui_out_field_string (uiout, "signal-name",
|
|
|
|
|
target_signal_to_name (stop_info));
|
|
|
|
|
annotate_signal_name_end ();
|
|
|
|
|
ui_out_text (uiout, ", ");
|
|
|
|
|
annotate_signal_string ();
|
|
|
|
|
ui_out_field_string (uiout, "signal-meaning",
|
|
|
|
|
target_signal_to_string (stop_info));
|
|
|
|
|
annotate_signal_string_end ();
|
|
|
|
|
}
|
2000-02-03 12:14:45 +08:00
|
|
|
|
ui_out_text (uiout, ".\n");
|
1999-11-09 09:23:30 +08:00
|
|
|
|
break;
|
2008-10-18 03:43:47 +08:00
|
|
|
|
case NO_HISTORY:
|
|
|
|
|
/* Reverse execution: target ran out of history info. */
|
|
|
|
|
ui_out_text (uiout, "\nNo more reverse-execution history.\n");
|
|
|
|
|
break;
|
1999-11-09 09:23:30 +08:00
|
|
|
|
default:
|
2001-02-08 14:03:54 +08:00
|
|
|
|
internal_error (__FILE__, __LINE__,
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up error_no_arg, query, perror_with_name, complaint, and
internal_error.
* breakpoint.c, cp-abi.c, cp-namespace.c, cp-support.c: Update.
* cris-tdep.c, dbxread.c, dictionary.c, dsrec.c: Update.
* dummy-frame.c, dve3900-rom.c, dwarf2-frame.c, dwarf2expr.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, event-loop.c: Update.
* exceptions.c, exec.c, f-lang.c, findvar.c, fork-child.c: Update.
* frame-unwind.c, frame.c, frv-linux-tdep.c, frv-tdep.c: Update.
* gdb_assert.h, gdbarch.c, gdbtypes.c, gnu-nat.c: Update.
* go32-nat.c, hppa-tdep.c, hppabsd-nat.c, hpread.c: Update.
* i386-linux-nat.c, i386-nat.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386fbsd-nat.c, inf-ptrace.c, inf-ttrace.c, infcall.c: Update.
* infcmd.c, inflow.c, infptrace.c, infrun.c, inftarg.c: Update.
* interps.c, language.c, linespec.c, linux-nat.c: Update.
* m32r-linux-nat.c, m68k-tdep.c, m68kbsd-nat.c: Update.
* m68klinux-nat.c, m88kbsd-nat.c, macroexp.c, macroscope.c: Update.
* macrotab.c, maint.c, mdebugread.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mips64obsd-nat.c: Update.
* mipsnbsd-nat.c, mn10300-tdep.c, monitor.c, nto-procfs.c: Update.
* objc-lang.c, objfiles.c, objfiles.h, ocd.c, osabi.c: Update.
* parse.c, ppc-bdm.c, ppc-linux-nat.c, ppc-sysv-tdep.c: Update.
* ppcnbsd-nat.c, ppcobsd-nat.c, printcmd.c, procfs.c: Update.
* regcache.c, reggroups.c, remote-e7000.c, remote-mips.c: Update.
* remote-rdp.c, remote-sds.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote.c, rs6000-nat.c, rs6000-tdep.c: Update.
* s390-nat.c, s390-tdep.c, sentinel-frame.c, serial.c: Update.
* sh-tdep.c, sh3-rom.c, sh64-tdep.c, shnbsd-nat.c: Update.
* solib-aix5.c, solib-svr4.c, solib.c, source.c: Update.
* sparc-nat.c, stabsread.c, stack.c, symfile.c, symtab.c: Update.
* symtab.h, target.c, tracepoint.c, ui-file.c, ui-out.c: Update.
* utils.c, valops.c, valprint.c, vax-nat.c, vaxbsd-nat.c: Update.
* win32-nat.c, xcoffread.c, xstormy16-tdep.c: Update.
* cli/cli-cmds.c, cli/cli-logging.c, cli/cli-script.c: Update.
* cli/cli-setshow.c, mi/mi-cmd-break.c, mi/mi-cmds.c: Update.
* mi/mi-console.c, mi/mi-getopt.c, mi/mi-out.c: Update.
* tui/tui-file.c, tui/tui-interp.c: Update.
2005-02-12 02:13:55 +08:00
|
|
|
|
_("print_stop_reason: unrecognized enum value"));
|
1999-11-09 09:23:30 +08:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
1999-07-06 01:58:44 +08:00
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
/* Here to return control to GDB when the inferior stops for real.
|
|
|
|
|
Print appropriate messages, remove breakpoints, give terminal our modes.
|
|
|
|
|
|
|
|
|
|
STOP_PRINT_FRAME nonzero means print the executing frame
|
|
|
|
|
(pc, function, args, file, line number and line text).
|
|
|
|
|
BREAKPOINTS_FAILED nonzero means stop was due to error
|
|
|
|
|
attempting to insert breakpoints. */
|
|
|
|
|
|
|
|
|
|
void
|
1999-08-10 05:36:23 +08:00
|
|
|
|
normal_stop (void)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
2003-09-09 04:13:48 +08:00
|
|
|
|
struct target_waitstatus last;
|
|
|
|
|
ptid_t last_ptid;
|
2009-01-19 01:42:16 +08:00
|
|
|
|
struct cleanup *old_chain = make_cleanup (null_cleanup, NULL);
|
2003-09-09 04:13:48 +08:00
|
|
|
|
|
|
|
|
|
get_last_target_status (&last_ptid, &last);
|
|
|
|
|
|
2009-01-19 01:42:16 +08:00
|
|
|
|
/* If an exception is thrown from this point on, make sure to
|
|
|
|
|
propagate GDB's knowledge of the executing state to the
|
|
|
|
|
frontend/user running state. A QUIT is an easy exception to see
|
|
|
|
|
here, so do this before any filtered output. */
|
* target.h (struct target_ops): Make to_has_all_memory,
to_has_memory, to_has_stack, to_has_registers and to_has_execution
methods instead of variables.
(target_has_all_memory_1, target_has_memory_1, target_has_stack_1)
(target_has_registers_1, target_has_execution_1): Declare
functions.
(target_has_all_memory): Rewrite to call target_has_all_memory_1.
(target_has_memory): Rewrite to call target_has_memory_1.
(target_has_stack): Rewrite to call target_has_all_stack_1.
(target_has_registers): Rewrite to call target_has_registers_1.
(target_has_execution): Rewrite to call target_has_execution_1.
(default_child_has_all_memory, default_child_has_memory)
(default_child_has_stack, default_child_has_registers)
(default_child_has_execution): Declare.
(target_mark_running, target_mark_exited): Delete declarations.
* target.c (default_child_has_all_memory,
default_child_has_memory, default_child_has_stack,
default_child_has_registers, default_child_has_execution): New.
(target_has_all_memory_1, target_has_memory_1, target_has_stack_1,
target_has_registers_1, target_has_execution_1): New.
(add_target): Default the to_has_all_memory, to_has_all_memory,
to_has_memory, to_has_stack, to_has_registers and to_has_execution
callbacks to return 0.
(update_current_target): Do not inherit to_has_all_memory,
to_has_memory, to_has_stack, to_has_registers or to_has_execution.
(target_mark_running, target_mark_exited): Delete.
(memory_xfer_partial): Adjust.
(target_read_memory, target_write_memory, target_search_memory):
Dispatch to the the top-most target, not the flattened
current_target.
(target_info): Adjust.
(init_dummy_target): Install return_zero as callback for
to_has_all_memory, to_has_memory, to_has_stack, to_has_registers,
to_has_execution.
(set_maintenance_target_async_permitted): Use have_live_inferiors
instead of target_has_execution.
* target-memory.c (target_write_memory_blocks): Dispatch memory
writes to the the top-most target, not the flattened
current_target.
* breakpoint.c (insert_breakpoints): Don't check for
target_has_execution here.
(update_global_location_list): Check if there are live inferiors
to debug instead of target_has_execution.
* infcmd.c (kill_command, detach_command): Check if there are
inferiors instead of target_has_execution.
* inferior.h (have_live_inferiors): Declare.
* inferior.c (have_live_inferiors): New.
* infrun.c (normal_stop): Don't check for target_has_execution to
finish the thread states.
* thread.c (is_thread_state, is_stopped, is_exited, is_running)
(any_running, is_executing): Remove checks for
target_has_execution.
* top.c (kill_or_detach): Don't try to kill core inferiors.
(quit_target): Don't check for target_has_execution.
* corelow.c (core_has_memory, core_has_stack, core_has_registers):
New.
(init_core_ops): Install core_has_memory, core_has_stack and
core_has_registers.
* exec.c (exec_has_memory): New.
(init_exec_ops): Install exec_has_memory.
* remote.c (remote_add_inferior): Don't call target_mark_running.
(remote_start_remote): Don't call target_mark_exited or call
target_mark_running.
(remote_open_1): Use have_inferiors instead of
target_has_execution. Don't use target_mark_exited.
(init_remote_ops): Install deafult_child_has_all_memory,
default_child_has_memory, default_child_has_stack,
default_child_has_registers, default_child_has_execution.
* bsd-kvm.c (bsd_kvm_return_one): New.
(bsd_kvm_add_target): Register bsd_kvm_return_one as
to_has_memory, to_has_stack and to_has_registers callbacks.
* remote-m32r-sdi.c (m32r_return_one): New.
(init_m32r_ops): Register it.
* inf-child.c (inf_child_target): Adjust to register
default_child_has_all_memory, default_child_has_memory,
default_child_has_stack, default_child_has_registers,
default_child_has_execution callbacks.
* gnu-nat.c (init_gnu_ops): Likewise.
* go32-nat.c (init_go32_ops): Likewise.
* hpux-thread.c (init_hpux_thread_ops): Likewise.
* monitor.c (init_base_monitor_ops): Likewise.
* nto-procfs.c (init_procfs_ops): Likewise.
* remote-mips.c (_initialize_remote_mips): Likewise.
* windows-nat.c (init_windows_ops): Likewise.
* remote-sim.c (gdbsim_create_inferior): Don't use
target_mark_running or target_mark_exited.
(gdbsim_mourn_inferior): Don't call target_mark_exited.
(init_gdbsim_ops): Adjust to register
default_child_has_all_memory, default_child_has_memory,
default_child_has_stack, default_child_has_registers,
default_child_has_execution callbacks.
* linux-nat.c (linux_nat_xfer_partial): If reading memory, and
there's no inferior selected, defer to a lower stratum.
2009-06-08 00:46:48 +08:00
|
|
|
|
if (!non_stop)
|
|
|
|
|
make_cleanup (finish_thread_state_cleanup, &minus_one_ptid);
|
|
|
|
|
else if (last.kind != TARGET_WAITKIND_SIGNALLED
|
|
|
|
|
&& last.kind != TARGET_WAITKIND_EXITED)
|
|
|
|
|
make_cleanup (finish_thread_state_cleanup, &inferior_ptid);
|
2009-01-19 01:42:16 +08:00
|
|
|
|
|
Exited threads.
* thread.c (enum thread_state): New.
(thread_state main_thread_running): Delete, in favor of...
(thread_state main_thread_state): ... this. Update throughout.
(clear_thread_inferior_resources): New, split from free_thread.
(free_thread): Call clear_thread_inferior_resources.
(init_thread_list): Set main thread to stopped state.
(add_thread_silent): Take care of PTID reuses.
(delete_thread): If deleting inferior_ptid or a thread with
refcount > 0, mark it as exited, but still keep it in the list.
Only notify of thread exits, if we haven't done so yet.
(iterate_over_threads): Make it safe to delete threads while
iterating over them.
(do_captured_list_thread_ids): Don't account for exited threads.
(thread_alive): Check for the THREAD_EXITED state, and don't set
ptid to -1 on exited threads.
(set_running): Update to account for extra possible states.
(is_thread_state): New.
(is_stopped, is_exited): New.
(is_running): Implement in terms of is_thread_state.
(any_running): Update.
(print_thread_info): Update. Account for exited threads. Don't
warn about missed frame restoring here, its done in the cleanup.
(switch_to_thread): Don't read from a thread that has gone.
(restore_current_thread): In non-stop mode, do a full context
switch.
(restore_selected_frame): Add a frame_level argument. Rewrite.
(struct current_thread_cleanup): Add selected_frame_level and
was_stopped members.
(do_restore_current_thread_cleanup): Check if thread was stopped
and still is, and if the target has registers, stack and memory
before restoring the selected frame. Don't delete the cleanup
argument here.
(restore_current_thread_cleanup_dtor): New.
(make_cleanup_restore_current_thread): Remove all arguments.
Rewrite.
(thread_apply_all_command): Update. Prune threads.
(thread_apply_command): Update.
(thread_command): Account for currently selected exited thread.
(do_captured_thread_select): Check for a running thread. Prune
threads.
(_initialize_thread): Make "info threads", "thread", "thread
apply", and "thread apply all" appliable without a selected thread.
* gdbthread.h (struct thread_info): Replace running_ by state_.
Add refcount.
(is_exited, is_stopped): Declare.
(make_cleanup_restore_current_thread): Remove all arguments.
* infrun.c: Include "event-top.h".
(fetch_inferior_event): In non-stop mode, restore selected thread
and frame after handling the event and running breakpoint
commands. Display GDB prompt if needed.
(normal_stop): In non-stop mode, don't print thread switching
notice.
* cli/cli-decode.c (set_cmd_no_selected_thread_ok)
(get_cmd_no_selected_thread_ok): New.
* cli/cli-decode.h (CMD_NO_SELECTED_THREAD_OK): New.
(set_cmd_no_selected_thread_ok, get_cmd_no_selected_thread_ok):
Declare.
* cli/cli-cmds.c: Set "pwd", "help", "info", "show" as
no-selected-thread ok.
* top.c (execute_command): Check for non no-selected-thread-ok
commands.
* linux-nat.c (struct saved_ptids, threads_to_delete)
(record_dead_thread, prune_lwps): Delete.
(exit_lwp): Unconditionally delete thread.
(linux_nat_resume): Remove prune_lwps call.
* infcmd.c (proceed_thread_callback): Check if !is_stopped instead
of is_running. Adjust to make_cleanup_restore_current_thread
interface change.
* mi/mi-main.c (mi_cmd_execute): Only allow a few commands if the
selected thread has exited.
* inf-loop.c (inferior_event_handler): Don't display the prompt
here.
* varobj.c (c_value_of_root): Update.
* defs.h (make_cleanup_dtor): Declare.
* utils.c (make_cleanup_dtor): New.
* Makefile.in (infrun.o): Depend on $(event_top_h).
2008-07-11 19:07:39 +08:00
|
|
|
|
/* In non-stop mode, we don't want GDB to switch threads behind the
|
|
|
|
|
user's back, to avoid races where the user is typing a command to
|
|
|
|
|
apply to thread x, but GDB switches to thread y before the user
|
|
|
|
|
finishes entering the command. */
|
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
/* As with the notification of thread events, we want to delay
|
|
|
|
|
notifying the user that we've switched thread context until
|
|
|
|
|
the inferior actually stops.
|
|
|
|
|
|
2003-09-09 04:13:48 +08:00
|
|
|
|
There's no point in saying anything if the inferior has exited.
|
|
|
|
|
Note that SIGNALLED here means "exited with a signal", not
|
|
|
|
|
"received a signal". */
|
Exited threads.
* thread.c (enum thread_state): New.
(thread_state main_thread_running): Delete, in favor of...
(thread_state main_thread_state): ... this. Update throughout.
(clear_thread_inferior_resources): New, split from free_thread.
(free_thread): Call clear_thread_inferior_resources.
(init_thread_list): Set main thread to stopped state.
(add_thread_silent): Take care of PTID reuses.
(delete_thread): If deleting inferior_ptid or a thread with
refcount > 0, mark it as exited, but still keep it in the list.
Only notify of thread exits, if we haven't done so yet.
(iterate_over_threads): Make it safe to delete threads while
iterating over them.
(do_captured_list_thread_ids): Don't account for exited threads.
(thread_alive): Check for the THREAD_EXITED state, and don't set
ptid to -1 on exited threads.
(set_running): Update to account for extra possible states.
(is_thread_state): New.
(is_stopped, is_exited): New.
(is_running): Implement in terms of is_thread_state.
(any_running): Update.
(print_thread_info): Update. Account for exited threads. Don't
warn about missed frame restoring here, its done in the cleanup.
(switch_to_thread): Don't read from a thread that has gone.
(restore_current_thread): In non-stop mode, do a full context
switch.
(restore_selected_frame): Add a frame_level argument. Rewrite.
(struct current_thread_cleanup): Add selected_frame_level and
was_stopped members.
(do_restore_current_thread_cleanup): Check if thread was stopped
and still is, and if the target has registers, stack and memory
before restoring the selected frame. Don't delete the cleanup
argument here.
(restore_current_thread_cleanup_dtor): New.
(make_cleanup_restore_current_thread): Remove all arguments.
Rewrite.
(thread_apply_all_command): Update. Prune threads.
(thread_apply_command): Update.
(thread_command): Account for currently selected exited thread.
(do_captured_thread_select): Check for a running thread. Prune
threads.
(_initialize_thread): Make "info threads", "thread", "thread
apply", and "thread apply all" appliable without a selected thread.
* gdbthread.h (struct thread_info): Replace running_ by state_.
Add refcount.
(is_exited, is_stopped): Declare.
(make_cleanup_restore_current_thread): Remove all arguments.
* infrun.c: Include "event-top.h".
(fetch_inferior_event): In non-stop mode, restore selected thread
and frame after handling the event and running breakpoint
commands. Display GDB prompt if needed.
(normal_stop): In non-stop mode, don't print thread switching
notice.
* cli/cli-decode.c (set_cmd_no_selected_thread_ok)
(get_cmd_no_selected_thread_ok): New.
* cli/cli-decode.h (CMD_NO_SELECTED_THREAD_OK): New.
(set_cmd_no_selected_thread_ok, get_cmd_no_selected_thread_ok):
Declare.
* cli/cli-cmds.c: Set "pwd", "help", "info", "show" as
no-selected-thread ok.
* top.c (execute_command): Check for non no-selected-thread-ok
commands.
* linux-nat.c (struct saved_ptids, threads_to_delete)
(record_dead_thread, prune_lwps): Delete.
(exit_lwp): Unconditionally delete thread.
(linux_nat_resume): Remove prune_lwps call.
* infcmd.c (proceed_thread_callback): Check if !is_stopped instead
of is_running. Adjust to make_cleanup_restore_current_thread
interface change.
* mi/mi-main.c (mi_cmd_execute): Only allow a few commands if the
selected thread has exited.
* inf-loop.c (inferior_event_handler): Don't display the prompt
here.
* varobj.c (c_value_of_root): Update.
* defs.h (make_cleanup_dtor): Declare.
* utils.c (make_cleanup_dtor): New.
* Makefile.in (infrun.o): Depend on $(event_top_h).
2008-07-11 19:07:39 +08:00
|
|
|
|
if (!non_stop
|
|
|
|
|
&& !ptid_equal (previous_inferior_ptid, inferior_ptid)
|
2003-09-09 04:13:48 +08:00
|
|
|
|
&& target_has_execution
|
|
|
|
|
&& last.kind != TARGET_WAITKIND_SIGNALLED
|
|
|
|
|
&& last.kind != TARGET_WAITKIND_EXITED)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
target_terminal_ours_for_output ();
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up some of printf_filtered and printf_unfiltered.
* ada-lang.c, annotate.c, arch-utils.c, breakpoint.c: Update.
* corelow.c, cp-namespace.c, cp-support.c, dcache.c: Update.
* demangle.c, dsrec.c, dwarf2read.c, dwarfread.c: Update.
* event-loop.c, event-top.c, exec.c, f-valprint.c: Update.
* gdbtypes.c, inf-loop.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcmd.c, inflow.c, infrun.c, inftarg.c, language.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, maint.c: Update.
* mdebugread.c, memattr.c, monitor.c, objc-lang.c: Update.
* ocd.c, osabi.c, printcmd.c, procfs.c, regcache.c: Update.
* remote.c, solib-som.c, solib.c, somsolib.c, source.c: Update.
* stack.c, symfile.c, symmisc.c, target.c, thread.c: Update.
* top.c, utils.c, valprint.c, value.c, cli/cli-cmds.c: Update.
* cli/cli-dump.c, cli/cli-logging.c, tui/tui-hooks.c: Update.
* tui/tui-regs.c, tui/tui-win.c: Update.
2005-02-12 08:39:24 +08:00
|
|
|
|
printf_filtered (_("[Switching to %s]\n"),
|
2007-12-17 03:14:23 +08:00
|
|
|
|
target_pid_to_str (inferior_ptid));
|
2008-06-06 08:33:52 +08:00
|
|
|
|
annotate_thread_changed ();
|
2001-05-04 12:15:33 +08:00
|
|
|
|
previous_inferior_ptid = inferior_ptid;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
2008-04-24 18:21:45 +08:00
|
|
|
|
if (!breakpoints_always_inserted_mode () && target_has_execution)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
if (remove_breakpoints ())
|
|
|
|
|
{
|
|
|
|
|
target_terminal_ours_for_output ();
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up some of printf_filtered and printf_unfiltered.
* ada-lang.c, annotate.c, arch-utils.c, breakpoint.c: Update.
* corelow.c, cp-namespace.c, cp-support.c, dcache.c: Update.
* demangle.c, dsrec.c, dwarf2read.c, dwarfread.c: Update.
* event-loop.c, event-top.c, exec.c, f-valprint.c: Update.
* gdbtypes.c, inf-loop.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcmd.c, inflow.c, infrun.c, inftarg.c, language.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, maint.c: Update.
* mdebugread.c, memattr.c, monitor.c, objc-lang.c: Update.
* ocd.c, osabi.c, printcmd.c, procfs.c, regcache.c: Update.
* remote.c, solib-som.c, solib.c, somsolib.c, source.c: Update.
* stack.c, symfile.c, symmisc.c, target.c, thread.c: Update.
* top.c, utils.c, valprint.c, value.c, cli/cli-cmds.c: Update.
* cli/cli-dump.c, cli/cli-logging.c, tui/tui-hooks.c: Update.
* tui/tui-regs.c, tui/tui-win.c: Update.
2005-02-12 08:39:24 +08:00
|
|
|
|
printf_filtered (_("\
|
|
|
|
|
Cannot remove breakpoints because program is no longer writable.\n\
|
|
|
|
|
Further execution is probably impossible.\n"));
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If an auto-display called a function and that got a signal,
|
|
|
|
|
delete that auto-display to avoid an infinite recursion. */
|
|
|
|
|
|
|
|
|
|
if (stopped_by_random_signal)
|
|
|
|
|
disable_current_display ();
|
|
|
|
|
|
|
|
|
|
/* Don't print a message if in the middle of doing a "step n"
|
|
|
|
|
operation for n > 1 */
|
2008-09-09 05:52:25 +08:00
|
|
|
|
if (target_has_execution
|
|
|
|
|
&& last.kind != TARGET_WAITKIND_SIGNALLED
|
|
|
|
|
&& last.kind != TARGET_WAITKIND_EXITED
|
|
|
|
|
&& inferior_thread ()->step_multi
|
2008-09-09 05:55:16 +08:00
|
|
|
|
&& inferior_thread ()->stop_step)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
|
|
target_terminal_ours ();
|
|
|
|
|
|
2006-03-31 00:37:13 +08:00
|
|
|
|
/* Set the current source location. This will also happen if we
|
|
|
|
|
display the frame below, but the current SAL will be incorrect
|
|
|
|
|
during a user hook-stop function. */
|
2009-03-26 05:42:35 +08:00
|
|
|
|
if (has_stack_frames () && !stop_stack_dummy)
|
2006-03-31 00:37:13 +08:00
|
|
|
|
set_current_sal_from_frame (get_current_frame (), 1);
|
|
|
|
|
|
2009-01-23 23:47:03 +08:00
|
|
|
|
/* Let the user/frontend see the threads as stopped. */
|
|
|
|
|
do_cleanups (old_chain);
|
|
|
|
|
|
|
|
|
|
/* Look up the hook_stop and run it (CLI internally handles problem
|
|
|
|
|
of stop_command's pre-hook not existing). */
|
|
|
|
|
if (stop_command)
|
|
|
|
|
catch_errors (hook_stop_stub, stop_command,
|
|
|
|
|
"Error while running hook_stop:\n", RETURN_MASK_ALL);
|
|
|
|
|
|
2009-03-26 05:42:35 +08:00
|
|
|
|
if (!has_stack_frames ())
|
2008-09-10 02:58:20 +08:00
|
|
|
|
goto done;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2008-09-09 05:48:52 +08:00
|
|
|
|
if (last.kind == TARGET_WAITKIND_SIGNALLED
|
|
|
|
|
|| last.kind == TARGET_WAITKIND_EXITED)
|
|
|
|
|
goto done;
|
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
/* Select innermost stack frame - i.e., current frame is frame 0,
|
|
|
|
|
and current location is based on that.
|
|
|
|
|
Don't do this on return from a stack dummy routine,
|
|
|
|
|
or if the program has exited. */
|
|
|
|
|
|
|
|
|
|
if (!stop_stack_dummy)
|
|
|
|
|
{
|
2002-05-05 09:15:13 +08:00
|
|
|
|
select_frame (get_current_frame ());
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
/* Print current location without a level number, if
|
1999-07-08 04:19:36 +08:00
|
|
|
|
we have changed functions or hit a breakpoint.
|
|
|
|
|
Print source line if we have one.
|
|
|
|
|
bpstat_print() contains the logic deciding in detail
|
|
|
|
|
what to print, based on the event(s) that just occurred. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2008-05-02 21:58:38 +08:00
|
|
|
|
/* If --batch-silent is enabled then there's no need to print the current
|
|
|
|
|
source location, and to try risks causing an error message about
|
|
|
|
|
missing source files. */
|
|
|
|
|
if (stop_print_frame && !batch_silent)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
int bpstat_ret;
|
|
|
|
|
int source_flag;
|
1999-10-19 10:47:02 +08:00
|
|
|
|
int do_frame_printing = 1;
|
2008-09-09 05:46:21 +08:00
|
|
|
|
struct thread_info *tp = inferior_thread ();
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2008-09-09 05:46:21 +08:00
|
|
|
|
bpstat_ret = bpstat_print (tp->stop_bpstat);
|
1999-10-19 10:47:02 +08:00
|
|
|
|
switch (bpstat_ret)
|
|
|
|
|
{
|
|
|
|
|
case PRINT_UNKNOWN:
|
2007-07-03 05:29:28 +08:00
|
|
|
|
/* If we had hit a shared library event breakpoint,
|
|
|
|
|
bpstat_print would print out this message. If we hit
|
|
|
|
|
an OS-level shared library event, do the same
|
|
|
|
|
thing. */
|
|
|
|
|
if (last.kind == TARGET_WAITKIND_LOADED)
|
|
|
|
|
{
|
|
|
|
|
printf_filtered (_("Stopped due to shared library event\n"));
|
|
|
|
|
source_flag = SRC_LINE; /* something bogus */
|
|
|
|
|
do_frame_printing = 0;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2002-12-06 15:35:55 +08:00
|
|
|
|
/* FIXME: cagney/2002-12-01: Given that a frame ID does
|
2004-08-25 22:47:07 +08:00
|
|
|
|
(or should) carry around the function and does (or
|
|
|
|
|
should) use that when doing a frame comparison. */
|
2008-09-09 05:55:16 +08:00
|
|
|
|
if (tp->stop_step
|
2008-09-09 05:46:21 +08:00
|
|
|
|
&& frame_id_eq (tp->step_frame_id,
|
2002-12-06 15:35:55 +08:00
|
|
|
|
get_frame_id (get_current_frame ()))
|
1999-10-19 10:47:02 +08:00
|
|
|
|
&& step_start_function == find_pc_function (stop_pc))
|
2002-07-19 01:53:50 +08:00
|
|
|
|
source_flag = SRC_LINE; /* finished step, just print source line */
|
1999-10-19 10:47:02 +08:00
|
|
|
|
else
|
2002-07-19 01:53:50 +08:00
|
|
|
|
source_flag = SRC_AND_LOC; /* print location and source line */
|
1999-10-19 10:47:02 +08:00
|
|
|
|
break;
|
|
|
|
|
case PRINT_SRC_AND_LOC:
|
2002-07-19 01:53:50 +08:00
|
|
|
|
source_flag = SRC_AND_LOC; /* print location and source line */
|
1999-10-19 10:47:02 +08:00
|
|
|
|
break;
|
|
|
|
|
case PRINT_SRC_ONLY:
|
2000-01-18 08:55:13 +08:00
|
|
|
|
source_flag = SRC_LINE;
|
1999-10-19 10:47:02 +08:00
|
|
|
|
break;
|
|
|
|
|
case PRINT_NOTHING:
|
2002-07-19 01:53:50 +08:00
|
|
|
|
source_flag = SRC_LINE; /* something bogus */
|
1999-10-19 10:47:02 +08:00
|
|
|
|
do_frame_printing = 0;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up error_no_arg, query, perror_with_name, complaint, and
internal_error.
* breakpoint.c, cp-abi.c, cp-namespace.c, cp-support.c: Update.
* cris-tdep.c, dbxread.c, dictionary.c, dsrec.c: Update.
* dummy-frame.c, dve3900-rom.c, dwarf2-frame.c, dwarf2expr.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, event-loop.c: Update.
* exceptions.c, exec.c, f-lang.c, findvar.c, fork-child.c: Update.
* frame-unwind.c, frame.c, frv-linux-tdep.c, frv-tdep.c: Update.
* gdb_assert.h, gdbarch.c, gdbtypes.c, gnu-nat.c: Update.
* go32-nat.c, hppa-tdep.c, hppabsd-nat.c, hpread.c: Update.
* i386-linux-nat.c, i386-nat.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386fbsd-nat.c, inf-ptrace.c, inf-ttrace.c, infcall.c: Update.
* infcmd.c, inflow.c, infptrace.c, infrun.c, inftarg.c: Update.
* interps.c, language.c, linespec.c, linux-nat.c: Update.
* m32r-linux-nat.c, m68k-tdep.c, m68kbsd-nat.c: Update.
* m68klinux-nat.c, m88kbsd-nat.c, macroexp.c, macroscope.c: Update.
* macrotab.c, maint.c, mdebugread.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mips64obsd-nat.c: Update.
* mipsnbsd-nat.c, mn10300-tdep.c, monitor.c, nto-procfs.c: Update.
* objc-lang.c, objfiles.c, objfiles.h, ocd.c, osabi.c: Update.
* parse.c, ppc-bdm.c, ppc-linux-nat.c, ppc-sysv-tdep.c: Update.
* ppcnbsd-nat.c, ppcobsd-nat.c, printcmd.c, procfs.c: Update.
* regcache.c, reggroups.c, remote-e7000.c, remote-mips.c: Update.
* remote-rdp.c, remote-sds.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote.c, rs6000-nat.c, rs6000-tdep.c: Update.
* s390-nat.c, s390-tdep.c, sentinel-frame.c, serial.c: Update.
* sh-tdep.c, sh3-rom.c, sh64-tdep.c, shnbsd-nat.c: Update.
* solib-aix5.c, solib-svr4.c, solib.c, source.c: Update.
* sparc-nat.c, stabsread.c, stack.c, symfile.c, symtab.c: Update.
* symtab.h, target.c, tracepoint.c, ui-file.c, ui-out.c: Update.
* utils.c, valops.c, valprint.c, vax-nat.c, vaxbsd-nat.c: Update.
* win32-nat.c, xcoffread.c, xstormy16-tdep.c: Update.
* cli/cli-cmds.c, cli/cli-logging.c, cli/cli-script.c: Update.
* cli/cli-setshow.c, mi/mi-cmd-break.c, mi/mi-cmds.c: Update.
* mi/mi-console.c, mi/mi-getopt.c, mi/mi-out.c: Update.
* tui/tui-file.c, tui/tui-interp.c: Update.
2005-02-12 02:13:55 +08:00
|
|
|
|
internal_error (__FILE__, __LINE__, _("Unknown value."));
|
1999-10-19 10:47:02 +08:00
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
/* The behavior of this routine with respect to the source
|
|
|
|
|
flag is:
|
2000-01-18 08:55:13 +08:00
|
|
|
|
SRC_LINE: Print only source line
|
|
|
|
|
LOCATION: Print only location
|
|
|
|
|
SRC_AND_LOC: Print location and source line */
|
1999-10-19 10:47:02 +08:00
|
|
|
|
if (do_frame_printing)
|
2004-10-29 Andrew Cagney <cagney@gnu.org>
* frame.h (get_selected_frame): Add message parameter.
* frame.c (get_selected_frame): Add and use message parameter.
* stack.c (current_frame_command, return_command, locals_info)
(catch_info, args_info, up_silently_base, down_silently_base): Use
get_selected_frame with an explicit message.
* thread.c, stack.c, sh-tdep.c, sh64-tdep.c: Update.
* remote-rdp.c, remote-mips.c, remote-e7000.c: Update.
* ocd.c, mi/mi-main.c, mi/mi-cmd-stack.c: Update.
* infrun.c, inflow.c, infcmd.c, frame.c: Update.
* findvar.c, eval.c, corelow.c, bsd-kvm.c: Update.
* breakpoint.c: Update.
2004-10-30 04:23:17 +08:00
|
|
|
|
print_stack_frame (get_selected_frame (NULL), 0, source_flag);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
/* Display the auto-display expressions. */
|
|
|
|
|
do_displays ();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Save the function value return registers, if we care.
|
|
|
|
|
We might be about to restore their previous contents. */
|
2008-09-09 05:48:52 +08:00
|
|
|
|
if (inferior_thread ()->proceed_to_finish)
|
2007-06-22 20:38:04 +08:00
|
|
|
|
{
|
|
|
|
|
/* This should not be necessary. */
|
|
|
|
|
if (stop_registers)
|
|
|
|
|
regcache_xfree (stop_registers);
|
|
|
|
|
|
|
|
|
|
/* NB: The copy goes through to the target picking up the value of
|
|
|
|
|
all the registers. */
|
|
|
|
|
stop_registers = regcache_dup (get_current_regcache ());
|
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
if (stop_stack_dummy)
|
|
|
|
|
{
|
* dummy-frame.c (dummy_frame): Replace regcache member with
caller_state.
(dummy_frame_push): Replace caller_regcache arg with caller_state.
All callers updated.
(remove_dummy_frame,pop_dummy_frame,lookup_dummy_frame): New fns.
(dummy_frame_pop): Rewrite. Verify requested frame is in the
dummy frame stack. Restore program state.
(cleanup_dummy_frames): Rewrite.
(dummy_frame_sniffer): Update. Make static.
* dummy-frame.h (regcache,frame_info): Delete forward decls.
(inferior_thread_state): New forward decl.
(dummy_frame_push): Update prototype.
* frame.c (frame_pop): dummy_frame_pop now does all the work for
DUMMY_FRAMEs.
* infcall.c (breakpoint_auto_delete_contents): Delete.
(get_function_name,run_inferior_call): New fns.
(call_function_by_hand): Simplify by moving some code to
get_function_name, run_inferior_call. Inferior function call wrapped
in TRY_CATCH so there's less need for cleanups and all exits from
proceed are handled similarily. Detect program exit.
Detect program stopping in a different thread.
Make error messages more consistent.
* inferior.h (inferior_thread_state): Declare (opaque type).
(save_inferior_thread_state,restore_inferior_thread_state,
make_cleanup_restore_inferior_thread_state,
discard_inferior_thread_state, get_inferior_thread_state_regcache):
Declare.
(save_inferior_status): Update prototype.
* infrun.c: (normal_stop): When stopped for the completion of an
inferior function call, verify the expected stack frame kind.
(inferior_thread_state): New struct.
(save_inferior_thread_state,restore_inferior_thread_state,
do_restore_inferior_thread_state_cleanup,
make_cleanup_restore_inferior_thread_state,
discard_inferior_thread_state,
get_inferior_thread_state_regcache): New functions.
(inferior_status): Move stop_signal, stop_pc, registers to
inferior_thread_state. Remove restore_stack_info.
(save_inferior_status): Remove arg restore_stack_info.
All callers updated. Remove saving of state now saved by
save_inferior_thread_state.
(restore_inferior_status): Remove restoration of state now done by
restore_inferior_thread_state.
(discard_inferior_status): Remove freeing of registers, now done by
discard_inferior_thread_state.
* gdb.base/break.exp: Update expected gdb output.
* gdb.base/sepdebug.exp: Ditto.
* gdb.mi/mi-syn-frame.exp: Ditto.
* gdb.mi/mi2-syn-frame.exp: Ditto.
* gdb.base/call-signal-resume.exp: New file.
* gdb.base/call-signals.c: New file.
* gdb.base/unwindonsignal.exp: New file.
* gdb.base/unwindonsignal.c: New file.
* gdb.threads/interrupted-hand-call.exp: New file.
* gdb.threads/interrupted-hand-call.c: New file.
* gdb.threads/thread-unwindonsignal.exp: New file.
2009-01-20 03:05:01 +08:00
|
|
|
|
/* Pop the empty frame that contains the stack dummy.
|
|
|
|
|
This also restores inferior state prior to the call
|
|
|
|
|
(struct inferior_thread_state). */
|
|
|
|
|
struct frame_info *frame = get_current_frame ();
|
|
|
|
|
gdb_assert (get_frame_type (frame) == DUMMY_FRAME);
|
|
|
|
|
frame_pop (frame);
|
|
|
|
|
/* frame_pop() calls reinit_frame_cache as the last thing it does
|
|
|
|
|
which means there's currently no selected frame. We don't need
|
|
|
|
|
to re-establish a selected frame if the dummy call returns normally,
|
|
|
|
|
that will be done by restore_inferior_status. However, we do have
|
|
|
|
|
to handle the case where the dummy call is returning after being
|
|
|
|
|
stopped (e.g. the dummy call previously hit a breakpoint). We
|
|
|
|
|
can't know which case we have so just always re-establish a
|
|
|
|
|
selected frame here. */
|
2002-05-05 09:15:13 +08:00
|
|
|
|
select_frame (get_current_frame ());
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
done:
|
|
|
|
|
annotate_stopped ();
|
2009-03-23 01:57:11 +08:00
|
|
|
|
|
|
|
|
|
/* Suppress the stop observer if we're in the middle of:
|
|
|
|
|
|
|
|
|
|
- a step n (n > 1), as there still more steps to be done.
|
|
|
|
|
|
|
|
|
|
- a "finish" command, as the observer will be called in
|
|
|
|
|
finish_command_continuation, so it can include the inferior
|
|
|
|
|
function's return value.
|
|
|
|
|
|
|
|
|
|
- calling an inferior function, as we pretend we inferior didn't
|
|
|
|
|
run at all. The return value of the call is handled by the
|
|
|
|
|
expression evaluator, through call_function_by_hand. */
|
|
|
|
|
|
|
|
|
|
if (!target_has_execution
|
|
|
|
|
|| last.kind == TARGET_WAITKIND_SIGNALLED
|
|
|
|
|
|| last.kind == TARGET_WAITKIND_EXITED
|
|
|
|
|
|| (!inferior_thread ()->step_multi
|
|
|
|
|
&& !(inferior_thread ()->stop_bpstat
|
2009-03-23 01:59:59 +08:00
|
|
|
|
&& inferior_thread ()->proceed_to_finish)
|
|
|
|
|
&& !inferior_thread ()->in_infcall))
|
2008-09-09 05:46:21 +08:00
|
|
|
|
{
|
|
|
|
|
if (!ptid_equal (inferior_ptid, null_ptid))
|
2009-02-14 23:24:44 +08:00
|
|
|
|
observer_notify_normal_stop (inferior_thread ()->stop_bpstat,
|
|
|
|
|
stop_print_frame);
|
2008-09-09 05:46:21 +08:00
|
|
|
|
else
|
2009-02-14 23:24:44 +08:00
|
|
|
|
observer_notify_normal_stop (NULL, stop_print_frame);
|
2008-09-09 05:46:21 +08:00
|
|
|
|
}
|
|
|
|
|
|
2008-12-12 22:20:48 +08:00
|
|
|
|
if (target_has_execution)
|
|
|
|
|
{
|
|
|
|
|
if (last.kind != TARGET_WAITKIND_SIGNALLED
|
|
|
|
|
&& last.kind != TARGET_WAITKIND_EXITED)
|
|
|
|
|
/* Delete the breakpoint we stopped at, if it wants to be deleted.
|
|
|
|
|
Delete any breakpoint that is to be deleted at the next stop. */
|
|
|
|
|
breakpoint_auto_delete (inferior_thread ()->stop_bpstat);
|
Non-stop inferior control.
* infrun.c (resume): In non-stop mode, always resume just one
thread.
(proceed): Don't call prepare_to_proceed in non-stop mode.
(fetch_inferior_event): In non-stop mode, switch context before
handling the event.
(error_is_running, ensure_not_running): New.
(handle_inferior_event): In non-stop mode: Mark only the event
thread as stopped. Require that the target module manages adding
threads to the thread list. Assert that there isn't a
deferred_step_ptid set. Don't switch to infwait_thread_hop_state.
(normal_stop): Only mark not-running if inferior hasn't exited.
In non-stop mode, only mark the event thread.
* thread.c:Include "cli/cli-decode.h".
(print_thread_info): Don't read from a running thread.
Output "(running)" if thread is running.
(switch_to_thread): Don't read stop_pc if thread is executing.
(do_restore_current_thread_cleanup): Don't write to a running
thread.
(thread_apply_all_command): Don't read from a running thread. In
non-stop mode, do a full context-switch instead of just switching
threads.
(thread_apply_command): In non-stop mode, do a full context-switch
instead of just switching threads.
(do_captured_thread_select): Likewise. Inform user if selected
thread is running.
(_initialize_thread): Mark "info threads" and "thread" and
async_ok.
* inf-loop.c (inferior_event_handler): In non-stop mode, don't
unregister the target from the event loop.
* infcmd.c (continue_command, step_1, jump_command)
(signal_command): Ensure the selected thread isn't running.
(interrupt_target_command): In non-stop mode, interrupt only the
selected thread.
* inferior.h (error_is_running, ensure_not_running): Declare.
* target.h (struct target_ops): Add ptid argument to the to_stop
member.
(target_stop): Add ptid_t argument.
* target.c (update_current_target): Add ptid argument to to_stop's
type.
(debug_to_stop): Add ptid_t argument.
(debug_to_rcmd): Set to_stop_ptid.
* remote.c (remote_stop): Add ptid_t argument.
(async_remote_interrupt): Add inferior_ptid to target_stop.
* inf-ptrace.c (inf_ptrace_stop): Add ptid argument.
* Makefile.in (thread.o): Depend on $(cli_decode_h).
2008-07-10 06:42:43 +08:00
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
1999-08-10 05:36:23 +08:00
|
|
|
|
hook_stop_stub (void *cmd)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
2002-03-18 03:53:39 +08:00
|
|
|
|
execute_cmd_pre_hook ((struct cmd_list_element *) cmd);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
return (0);
|
|
|
|
|
}
|
|
|
|
|
|
1999-07-08 04:19:36 +08:00
|
|
|
|
int
|
1999-08-10 05:36:23 +08:00
|
|
|
|
signal_stop_state (int signo)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
2008-09-22 23:20:08 +08:00
|
|
|
|
return signal_stop[signo];
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
1999-07-08 04:19:36 +08:00
|
|
|
|
int
|
1999-08-10 05:36:23 +08:00
|
|
|
|
signal_print_state (int signo)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
return signal_print[signo];
|
|
|
|
|
}
|
|
|
|
|
|
1999-07-08 04:19:36 +08:00
|
|
|
|
int
|
1999-08-10 05:36:23 +08:00
|
|
|
|
signal_pass_state (int signo)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
return signal_program[signo];
|
|
|
|
|
}
|
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
int
|
2002-09-19 06:44:31 +08:00
|
|
|
|
signal_stop_update (int signo, int state)
|
1999-09-09 08:02:17 +08:00
|
|
|
|
{
|
|
|
|
|
int ret = signal_stop[signo];
|
|
|
|
|
signal_stop[signo] = state;
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
int
|
2002-09-19 06:44:31 +08:00
|
|
|
|
signal_print_update (int signo, int state)
|
1999-09-09 08:02:17 +08:00
|
|
|
|
{
|
|
|
|
|
int ret = signal_print[signo];
|
|
|
|
|
signal_print[signo] = state;
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
int
|
2002-09-19 06:44:31 +08:00
|
|
|
|
signal_pass_update (int signo, int state)
|
1999-09-09 08:02:17 +08:00
|
|
|
|
{
|
|
|
|
|
int ret = signal_program[signo];
|
|
|
|
|
signal_program[signo] = state;
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
static void
|
1999-08-10 05:36:23 +08:00
|
|
|
|
sig_print_header (void)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up some of printf_filtered and printf_unfiltered.
* ada-lang.c, annotate.c, arch-utils.c, breakpoint.c: Update.
* corelow.c, cp-namespace.c, cp-support.c, dcache.c: Update.
* demangle.c, dsrec.c, dwarf2read.c, dwarfread.c: Update.
* event-loop.c, event-top.c, exec.c, f-valprint.c: Update.
* gdbtypes.c, inf-loop.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcmd.c, inflow.c, infrun.c, inftarg.c, language.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, maint.c: Update.
* mdebugread.c, memattr.c, monitor.c, objc-lang.c: Update.
* ocd.c, osabi.c, printcmd.c, procfs.c, regcache.c: Update.
* remote.c, solib-som.c, solib.c, somsolib.c, source.c: Update.
* stack.c, symfile.c, symmisc.c, target.c, thread.c: Update.
* top.c, utils.c, valprint.c, value.c, cli/cli-cmds.c: Update.
* cli/cli-dump.c, cli/cli-logging.c, tui/tui-hooks.c: Update.
* tui/tui-regs.c, tui/tui-win.c: Update.
2005-02-12 08:39:24 +08:00
|
|
|
|
printf_filtered (_("\
|
|
|
|
|
Signal Stop\tPrint\tPass to program\tDescription\n"));
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
1999-08-10 05:36:23 +08:00
|
|
|
|
sig_print_info (enum target_signal oursig)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
2009-01-16 06:07:20 +08:00
|
|
|
|
const char *name = target_signal_to_name (oursig);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
int name_padding = 13 - strlen (name);
|
1999-08-10 05:36:23 +08:00
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
if (name_padding <= 0)
|
|
|
|
|
name_padding = 0;
|
|
|
|
|
|
|
|
|
|
printf_filtered ("%s", name);
|
2002-07-19 01:53:50 +08:00
|
|
|
|
printf_filtered ("%*.*s ", name_padding, name_padding, " ");
|
1999-04-16 09:35:26 +08:00
|
|
|
|
printf_filtered ("%s\t", signal_stop[oursig] ? "Yes" : "No");
|
|
|
|
|
printf_filtered ("%s\t", signal_print[oursig] ? "Yes" : "No");
|
|
|
|
|
printf_filtered ("%s\t\t", signal_program[oursig] ? "Yes" : "No");
|
|
|
|
|
printf_filtered ("%s\n", target_signal_to_string (oursig));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Specify how various signals in the inferior should be handled. */
|
|
|
|
|
|
|
|
|
|
static void
|
1999-08-10 05:36:23 +08:00
|
|
|
|
handle_command (char *args, int from_tty)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
char **argv;
|
|
|
|
|
int digits, wordlen;
|
|
|
|
|
int sigfirst, signum, siglast;
|
|
|
|
|
enum target_signal oursig;
|
|
|
|
|
int allsigs;
|
|
|
|
|
int nsigs;
|
|
|
|
|
unsigned char *sigs;
|
|
|
|
|
struct cleanup *old_chain;
|
|
|
|
|
|
|
|
|
|
if (args == NULL)
|
|
|
|
|
{
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up error_no_arg, query, perror_with_name, complaint, and
internal_error.
* breakpoint.c, cp-abi.c, cp-namespace.c, cp-support.c: Update.
* cris-tdep.c, dbxread.c, dictionary.c, dsrec.c: Update.
* dummy-frame.c, dve3900-rom.c, dwarf2-frame.c, dwarf2expr.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, event-loop.c: Update.
* exceptions.c, exec.c, f-lang.c, findvar.c, fork-child.c: Update.
* frame-unwind.c, frame.c, frv-linux-tdep.c, frv-tdep.c: Update.
* gdb_assert.h, gdbarch.c, gdbtypes.c, gnu-nat.c: Update.
* go32-nat.c, hppa-tdep.c, hppabsd-nat.c, hpread.c: Update.
* i386-linux-nat.c, i386-nat.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386fbsd-nat.c, inf-ptrace.c, inf-ttrace.c, infcall.c: Update.
* infcmd.c, inflow.c, infptrace.c, infrun.c, inftarg.c: Update.
* interps.c, language.c, linespec.c, linux-nat.c: Update.
* m32r-linux-nat.c, m68k-tdep.c, m68kbsd-nat.c: Update.
* m68klinux-nat.c, m88kbsd-nat.c, macroexp.c, macroscope.c: Update.
* macrotab.c, maint.c, mdebugread.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mips64obsd-nat.c: Update.
* mipsnbsd-nat.c, mn10300-tdep.c, monitor.c, nto-procfs.c: Update.
* objc-lang.c, objfiles.c, objfiles.h, ocd.c, osabi.c: Update.
* parse.c, ppc-bdm.c, ppc-linux-nat.c, ppc-sysv-tdep.c: Update.
* ppcnbsd-nat.c, ppcobsd-nat.c, printcmd.c, procfs.c: Update.
* regcache.c, reggroups.c, remote-e7000.c, remote-mips.c: Update.
* remote-rdp.c, remote-sds.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote.c, rs6000-nat.c, rs6000-tdep.c: Update.
* s390-nat.c, s390-tdep.c, sentinel-frame.c, serial.c: Update.
* sh-tdep.c, sh3-rom.c, sh64-tdep.c, shnbsd-nat.c: Update.
* solib-aix5.c, solib-svr4.c, solib.c, source.c: Update.
* sparc-nat.c, stabsread.c, stack.c, symfile.c, symtab.c: Update.
* symtab.h, target.c, tracepoint.c, ui-file.c, ui-out.c: Update.
* utils.c, valops.c, valprint.c, vax-nat.c, vaxbsd-nat.c: Update.
* win32-nat.c, xcoffread.c, xstormy16-tdep.c: Update.
* cli/cli-cmds.c, cli/cli-logging.c, cli/cli-script.c: Update.
* cli/cli-setshow.c, mi/mi-cmd-break.c, mi/mi-cmds.c: Update.
* mi/mi-console.c, mi/mi-getopt.c, mi/mi-out.c: Update.
* tui/tui-file.c, tui/tui-interp.c: Update.
2005-02-12 02:13:55 +08:00
|
|
|
|
error_no_arg (_("signal to handle"));
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Allocate and zero an array of flags for which signals to handle. */
|
|
|
|
|
|
|
|
|
|
nsigs = (int) TARGET_SIGNAL_LAST;
|
|
|
|
|
sigs = (unsigned char *) alloca (nsigs);
|
|
|
|
|
memset (sigs, 0, nsigs);
|
|
|
|
|
|
|
|
|
|
/* Break the command line up into args. */
|
|
|
|
|
|
2008-10-04 00:36:10 +08:00
|
|
|
|
argv = gdb_buildargv (args);
|
1999-04-27 02:34:20 +08:00
|
|
|
|
old_chain = make_cleanup_freeargv (argv);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
/* Walk through the args, looking for signal oursigs, signal names, and
|
|
|
|
|
actions. Signal numbers and signal names may be interspersed with
|
|
|
|
|
actions, with the actions being performed for all signals cumulatively
|
|
|
|
|
specified. Signal ranges can be specified as <LOW>-<HIGH>. */
|
|
|
|
|
|
|
|
|
|
while (*argv != NULL)
|
|
|
|
|
{
|
|
|
|
|
wordlen = strlen (*argv);
|
|
|
|
|
for (digits = 0; isdigit ((*argv)[digits]); digits++)
|
|
|
|
|
{;
|
|
|
|
|
}
|
|
|
|
|
allsigs = 0;
|
|
|
|
|
sigfirst = siglast = -1;
|
|
|
|
|
|
|
|
|
|
if (wordlen >= 1 && !strncmp (*argv, "all", wordlen))
|
|
|
|
|
{
|
|
|
|
|
/* Apply action to all signals except those used by the
|
|
|
|
|
debugger. Silently skip those. */
|
|
|
|
|
allsigs = 1;
|
|
|
|
|
sigfirst = 0;
|
|
|
|
|
siglast = nsigs - 1;
|
|
|
|
|
}
|
|
|
|
|
else if (wordlen >= 1 && !strncmp (*argv, "stop", wordlen))
|
|
|
|
|
{
|
|
|
|
|
SET_SIGS (nsigs, sigs, signal_stop);
|
|
|
|
|
SET_SIGS (nsigs, sigs, signal_print);
|
|
|
|
|
}
|
|
|
|
|
else if (wordlen >= 1 && !strncmp (*argv, "ignore", wordlen))
|
|
|
|
|
{
|
|
|
|
|
UNSET_SIGS (nsigs, sigs, signal_program);
|
|
|
|
|
}
|
|
|
|
|
else if (wordlen >= 2 && !strncmp (*argv, "print", wordlen))
|
|
|
|
|
{
|
|
|
|
|
SET_SIGS (nsigs, sigs, signal_print);
|
|
|
|
|
}
|
|
|
|
|
else if (wordlen >= 2 && !strncmp (*argv, "pass", wordlen))
|
|
|
|
|
{
|
|
|
|
|
SET_SIGS (nsigs, sigs, signal_program);
|
|
|
|
|
}
|
|
|
|
|
else if (wordlen >= 3 && !strncmp (*argv, "nostop", wordlen))
|
|
|
|
|
{
|
|
|
|
|
UNSET_SIGS (nsigs, sigs, signal_stop);
|
|
|
|
|
}
|
|
|
|
|
else if (wordlen >= 3 && !strncmp (*argv, "noignore", wordlen))
|
|
|
|
|
{
|
|
|
|
|
SET_SIGS (nsigs, sigs, signal_program);
|
|
|
|
|
}
|
|
|
|
|
else if (wordlen >= 4 && !strncmp (*argv, "noprint", wordlen))
|
|
|
|
|
{
|
|
|
|
|
UNSET_SIGS (nsigs, sigs, signal_print);
|
|
|
|
|
UNSET_SIGS (nsigs, sigs, signal_stop);
|
|
|
|
|
}
|
|
|
|
|
else if (wordlen >= 4 && !strncmp (*argv, "nopass", wordlen))
|
|
|
|
|
{
|
|
|
|
|
UNSET_SIGS (nsigs, sigs, signal_program);
|
|
|
|
|
}
|
|
|
|
|
else if (digits > 0)
|
|
|
|
|
{
|
|
|
|
|
/* It is numeric. The numeric signal refers to our own
|
|
|
|
|
internal signal numbering from target.h, not to host/target
|
|
|
|
|
signal number. This is a feature; users really should be
|
|
|
|
|
using symbolic names anyway, and the common ones like
|
|
|
|
|
SIGHUP, SIGINT, SIGALRM, etc. will work right anyway. */
|
|
|
|
|
|
|
|
|
|
sigfirst = siglast = (int)
|
|
|
|
|
target_signal_from_command (atoi (*argv));
|
|
|
|
|
if ((*argv)[digits] == '-')
|
|
|
|
|
{
|
|
|
|
|
siglast = (int)
|
|
|
|
|
target_signal_from_command (atoi ((*argv) + digits + 1));
|
|
|
|
|
}
|
|
|
|
|
if (sigfirst > siglast)
|
|
|
|
|
{
|
|
|
|
|
/* Bet he didn't figure we'd think of this case... */
|
|
|
|
|
signum = sigfirst;
|
|
|
|
|
sigfirst = siglast;
|
|
|
|
|
siglast = signum;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
oursig = target_signal_from_name (*argv);
|
|
|
|
|
if (oursig != TARGET_SIGNAL_UNKNOWN)
|
|
|
|
|
{
|
|
|
|
|
sigfirst = siglast = (int) oursig;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Not a number and not a recognized flag word => complain. */
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 12:06:14 +08:00
|
|
|
|
error (_("Unrecognized or ambiguous flag word: \"%s\"."), *argv);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If any signal numbers or symbol names were found, set flags for
|
1999-07-08 04:19:36 +08:00
|
|
|
|
which signals to apply actions to. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
for (signum = sigfirst; signum >= 0 && signum <= siglast; signum++)
|
|
|
|
|
{
|
|
|
|
|
switch ((enum target_signal) signum)
|
|
|
|
|
{
|
|
|
|
|
case TARGET_SIGNAL_TRAP:
|
|
|
|
|
case TARGET_SIGNAL_INT:
|
|
|
|
|
if (!allsigs && !sigs[signum])
|
|
|
|
|
{
|
2009-02-25 10:14:23 +08:00
|
|
|
|
if (query (_("%s is used by the debugger.\n\
|
|
|
|
|
Are you sure you want to change it? "), target_signal_to_name ((enum target_signal) signum)))
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
sigs[signum] = 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up some of printf_filtered and printf_unfiltered.
* ada-lang.c, annotate.c, arch-utils.c, breakpoint.c: Update.
* corelow.c, cp-namespace.c, cp-support.c, dcache.c: Update.
* demangle.c, dsrec.c, dwarf2read.c, dwarfread.c: Update.
* event-loop.c, event-top.c, exec.c, f-valprint.c: Update.
* gdbtypes.c, inf-loop.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcmd.c, inflow.c, infrun.c, inftarg.c, language.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, maint.c: Update.
* mdebugread.c, memattr.c, monitor.c, objc-lang.c: Update.
* ocd.c, osabi.c, printcmd.c, procfs.c, regcache.c: Update.
* remote.c, solib-som.c, solib.c, somsolib.c, source.c: Update.
* stack.c, symfile.c, symmisc.c, target.c, thread.c: Update.
* top.c, utils.c, valprint.c, value.c, cli/cli-cmds.c: Update.
* cli/cli-dump.c, cli/cli-logging.c, tui/tui-hooks.c: Update.
* tui/tui-regs.c, tui/tui-win.c: Update.
2005-02-12 08:39:24 +08:00
|
|
|
|
printf_unfiltered (_("Not confirmed, unchanged.\n"));
|
1999-04-16 09:35:26 +08:00
|
|
|
|
gdb_flush (gdb_stdout);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case TARGET_SIGNAL_0:
|
|
|
|
|
case TARGET_SIGNAL_DEFAULT:
|
|
|
|
|
case TARGET_SIGNAL_UNKNOWN:
|
|
|
|
|
/* Make sure that "all" doesn't print these. */
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
sigs[signum] = 1;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
argv++;
|
|
|
|
|
}
|
|
|
|
|
|
2008-12-31 09:34:10 +08:00
|
|
|
|
for (signum = 0; signum < nsigs; signum++)
|
|
|
|
|
if (sigs[signum])
|
|
|
|
|
{
|
|
|
|
|
target_notice_signals (inferior_ptid);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2008-12-31 09:34:10 +08:00
|
|
|
|
if (from_tty)
|
|
|
|
|
{
|
|
|
|
|
/* Show the results. */
|
|
|
|
|
sig_print_header ();
|
|
|
|
|
for (; signum < nsigs; signum++)
|
|
|
|
|
if (sigs[signum])
|
|
|
|
|
sig_print_info (signum);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
do_cleanups (old_chain);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
1999-08-10 05:36:23 +08:00
|
|
|
|
xdb_handle_command (char *args, int from_tty)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
char **argv;
|
|
|
|
|
struct cleanup *old_chain;
|
|
|
|
|
|
2008-10-04 00:36:10 +08:00
|
|
|
|
if (args == NULL)
|
|
|
|
|
error_no_arg (_("xdb command"));
|
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
/* Break the command line up into args. */
|
|
|
|
|
|
2008-10-04 00:36:10 +08:00
|
|
|
|
argv = gdb_buildargv (args);
|
1999-04-27 02:34:20 +08:00
|
|
|
|
old_chain = make_cleanup_freeargv (argv);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
if (argv[1] != (char *) NULL)
|
|
|
|
|
{
|
|
|
|
|
char *argBuf;
|
|
|
|
|
int bufLen;
|
|
|
|
|
|
|
|
|
|
bufLen = strlen (argv[0]) + 20;
|
|
|
|
|
argBuf = (char *) xmalloc (bufLen);
|
|
|
|
|
if (argBuf)
|
|
|
|
|
{
|
|
|
|
|
int validFlag = 1;
|
|
|
|
|
enum target_signal oursig;
|
|
|
|
|
|
|
|
|
|
oursig = target_signal_from_name (argv[0]);
|
|
|
|
|
memset (argBuf, 0, bufLen);
|
|
|
|
|
if (strcmp (argv[1], "Q") == 0)
|
|
|
|
|
sprintf (argBuf, "%s %s", argv[0], "noprint");
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (strcmp (argv[1], "s") == 0)
|
|
|
|
|
{
|
|
|
|
|
if (!signal_stop[oursig])
|
|
|
|
|
sprintf (argBuf, "%s %s", argv[0], "stop");
|
|
|
|
|
else
|
|
|
|
|
sprintf (argBuf, "%s %s", argv[0], "nostop");
|
|
|
|
|
}
|
|
|
|
|
else if (strcmp (argv[1], "i") == 0)
|
|
|
|
|
{
|
|
|
|
|
if (!signal_program[oursig])
|
|
|
|
|
sprintf (argBuf, "%s %s", argv[0], "pass");
|
|
|
|
|
else
|
|
|
|
|
sprintf (argBuf, "%s %s", argv[0], "nopass");
|
|
|
|
|
}
|
|
|
|
|
else if (strcmp (argv[1], "r") == 0)
|
|
|
|
|
{
|
|
|
|
|
if (!signal_print[oursig])
|
|
|
|
|
sprintf (argBuf, "%s %s", argv[0], "print");
|
|
|
|
|
else
|
|
|
|
|
sprintf (argBuf, "%s %s", argv[0], "noprint");
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
validFlag = 0;
|
|
|
|
|
}
|
|
|
|
|
if (validFlag)
|
|
|
|
|
handle_command (argBuf, from_tty);
|
|
|
|
|
else
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up some of printf_filtered and printf_unfiltered.
* ada-lang.c, annotate.c, arch-utils.c, breakpoint.c: Update.
* corelow.c, cp-namespace.c, cp-support.c, dcache.c: Update.
* demangle.c, dsrec.c, dwarf2read.c, dwarfread.c: Update.
* event-loop.c, event-top.c, exec.c, f-valprint.c: Update.
* gdbtypes.c, inf-loop.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcmd.c, inflow.c, infrun.c, inftarg.c, language.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, maint.c: Update.
* mdebugread.c, memattr.c, monitor.c, objc-lang.c: Update.
* ocd.c, osabi.c, printcmd.c, procfs.c, regcache.c: Update.
* remote.c, solib-som.c, solib.c, somsolib.c, source.c: Update.
* stack.c, symfile.c, symmisc.c, target.c, thread.c: Update.
* top.c, utils.c, valprint.c, value.c, cli/cli-cmds.c: Update.
* cli/cli-dump.c, cli/cli-logging.c, tui/tui-hooks.c: Update.
* tui/tui-regs.c, tui/tui-win.c: Update.
2005-02-12 08:39:24 +08:00
|
|
|
|
printf_filtered (_("Invalid signal handling flag.\n"));
|
1999-04-16 09:35:26 +08:00
|
|
|
|
if (argBuf)
|
2000-12-15 09:01:51 +08:00
|
|
|
|
xfree (argBuf);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
do_cleanups (old_chain);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Print current contents of the tables set by the handle command.
|
|
|
|
|
It is possible we should just be printing signals actually used
|
|
|
|
|
by the current target (but for things to work right when switching
|
|
|
|
|
targets, all signals should be in the signal tables). */
|
|
|
|
|
|
|
|
|
|
static void
|
1999-08-10 05:36:23 +08:00
|
|
|
|
signals_info (char *signum_exp, int from_tty)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
enum target_signal oursig;
|
|
|
|
|
sig_print_header ();
|
|
|
|
|
|
|
|
|
|
if (signum_exp)
|
|
|
|
|
{
|
|
|
|
|
/* First see if this is a symbol name. */
|
|
|
|
|
oursig = target_signal_from_name (signum_exp);
|
|
|
|
|
if (oursig == TARGET_SIGNAL_UNKNOWN)
|
|
|
|
|
{
|
|
|
|
|
/* No, try numeric. */
|
|
|
|
|
oursig =
|
2000-10-30 23:32:51 +08:00
|
|
|
|
target_signal_from_command (parse_and_eval_long (signum_exp));
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
sig_print_info (oursig);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
printf_filtered ("\n");
|
|
|
|
|
/* These ugly casts brought to you by the native VAX compiler. */
|
|
|
|
|
for (oursig = TARGET_SIGNAL_FIRST;
|
|
|
|
|
(int) oursig < (int) TARGET_SIGNAL_LAST;
|
|
|
|
|
oursig = (enum target_signal) ((int) oursig + 1))
|
|
|
|
|
{
|
|
|
|
|
QUIT;
|
|
|
|
|
|
|
|
|
|
if (oursig != TARGET_SIGNAL_UNKNOWN
|
2002-07-19 01:53:50 +08:00
|
|
|
|
&& oursig != TARGET_SIGNAL_DEFAULT && oursig != TARGET_SIGNAL_0)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
sig_print_info (oursig);
|
|
|
|
|
}
|
|
|
|
|
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up some of printf_filtered and printf_unfiltered.
* ada-lang.c, annotate.c, arch-utils.c, breakpoint.c: Update.
* corelow.c, cp-namespace.c, cp-support.c, dcache.c: Update.
* demangle.c, dsrec.c, dwarf2read.c, dwarfread.c: Update.
* event-loop.c, event-top.c, exec.c, f-valprint.c: Update.
* gdbtypes.c, inf-loop.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcmd.c, inflow.c, infrun.c, inftarg.c, language.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, maint.c: Update.
* mdebugread.c, memattr.c, monitor.c, objc-lang.c: Update.
* ocd.c, osabi.c, printcmd.c, procfs.c, regcache.c: Update.
* remote.c, solib-som.c, solib.c, somsolib.c, source.c: Update.
* stack.c, symfile.c, symmisc.c, target.c, thread.c: Update.
* top.c, utils.c, valprint.c, value.c, cli/cli-cmds.c: Update.
* cli/cli-dump.c, cli/cli-logging.c, tui/tui-hooks.c: Update.
* tui/tui-regs.c, tui/tui-win.c: Update.
2005-02-12 08:39:24 +08:00
|
|
|
|
printf_filtered (_("\nUse the \"handle\" command to change these tables.\n"));
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
2009-02-07 06:59:01 +08:00
|
|
|
|
|
|
|
|
|
/* The $_siginfo convenience variable is a bit special. We don't know
|
|
|
|
|
for sure the type of the value until we actually have a chance to
|
|
|
|
|
fetch the data. The type can change depending on gdbarch, so it it
|
|
|
|
|
also dependent on which thread you have selected.
|
|
|
|
|
|
|
|
|
|
1. making $_siginfo be an internalvar that creates a new value on
|
|
|
|
|
access.
|
|
|
|
|
|
|
|
|
|
2. making the value of $_siginfo be an lval_computed value. */
|
|
|
|
|
|
|
|
|
|
/* This function implements the lval_computed support for reading a
|
|
|
|
|
$_siginfo value. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
siginfo_value_read (struct value *v)
|
|
|
|
|
{
|
|
|
|
|
LONGEST transferred;
|
|
|
|
|
|
|
|
|
|
transferred =
|
|
|
|
|
target_read (¤t_target, TARGET_OBJECT_SIGNAL_INFO,
|
|
|
|
|
NULL,
|
|
|
|
|
value_contents_all_raw (v),
|
|
|
|
|
value_offset (v),
|
|
|
|
|
TYPE_LENGTH (value_type (v)));
|
|
|
|
|
|
|
|
|
|
if (transferred != TYPE_LENGTH (value_type (v)))
|
|
|
|
|
error (_("Unable to read siginfo"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This function implements the lval_computed support for writing a
|
|
|
|
|
$_siginfo value. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
siginfo_value_write (struct value *v, struct value *fromval)
|
|
|
|
|
{
|
|
|
|
|
LONGEST transferred;
|
|
|
|
|
|
|
|
|
|
transferred = target_write (¤t_target,
|
|
|
|
|
TARGET_OBJECT_SIGNAL_INFO,
|
|
|
|
|
NULL,
|
|
|
|
|
value_contents_all_raw (fromval),
|
|
|
|
|
value_offset (v),
|
|
|
|
|
TYPE_LENGTH (value_type (fromval)));
|
|
|
|
|
|
|
|
|
|
if (transferred != TYPE_LENGTH (value_type (fromval)))
|
|
|
|
|
error (_("Unable to write siginfo"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct lval_funcs siginfo_value_funcs =
|
|
|
|
|
{
|
|
|
|
|
siginfo_value_read,
|
|
|
|
|
siginfo_value_write
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Return a new value with the correct type for the siginfo object of
|
|
|
|
|
the current thread. Return a void value if there's no object
|
|
|
|
|
available. */
|
|
|
|
|
|
2008-02-21 Pedro Alves <pedro@codesorcery.com>
Silence a few -Wmissing-prototypes warnings.
PR build/9877:
* amd64-nat.c: Include "amd64-nat.h".
* fork-child.c (_initialize_fork_child): Ditto.
* gcore.c (_initialize_gcore): Ditto.
* inf-ptrace.c: Include "inf-ptrace.h".
(inf_ptrace_store_registers): Make it static.
* linux-nat.c (linux_nat_terminal_ours): Make it static.
(_initialize_linux_nat): Declare before definition.
* linux-tdep.c: Include "linux-tdep.h".
* linux-thread-db.c (_initialize_thread_db): Declare before
definition.
* proc-service.c (_initialize_proc_service): Ditto.
* remote.c (remote_send_printf): Make it static.
* solib.c: Include "solib.h".
* symfile-mem.c (_initialize_symfile_mem): Declare before
definition.
* ada-lang.c (ada_la_decode, ada_match_name)
(ada_suppress_symbol_printing, ada_is_array_type)
(ada_value_ptr_subscript, ada_array_length)
(ada_to_static_fixed_value): Make them static.
(_initialize_ada_language): Declare before definition.
* ada-tasks.c (ada_get_task_number, ada_get_environment_task)
(ada_task_list_changed, ada_new_objfile_observer): Make them
static.
(_initialize_tasks): Declare before definition.
* addrmap.c (_initialize_addrmap): Declare before definition.
* auxv.c (default_auxv_parse): Make it static.
* bfd-target.c (target_bfd_xfer_partial, target_bfd_xclose): Make
them static.
* breakpoint.c (remove_sal): Add line break.
(expand_line_sal_maybe): Make it static.
* cp-name-parser.y: Include "cp-support.h".
* cp-valprint.c (cp_find_class_member): Make it static.
* eval.c (value_f90_subarray): Ditto.
* exceptions.c (print_any_exception): Ditto.
* findcmd.c (_initialize_mem_search): Declare before definition.
* frame.c (frame_observer_target_changed): Make it static.
* gnu-v3-abi.c (gnuv3_find_method_in): Make it static.
* inf-child.c: Include "inf-child.h".
* inferior.h (valid_inferior_id): Rename to ...
(valid_gdb_inferior_id): ... this.
* infrun.c (infrun_thread_stop_requested, siginfo_make_value):
Make them static.
* jv-lang.c (java_language_arch_info): Make it static.
* m2-typeprint.c (m2_get_discrete_bounds): Ditto.
* osdata.c (info_osdata_command): Make it static.
* regcache.c (regcache_observer_target_changed): Make it static.
* reverse.c (_initialize_reverse): Declare before definition.
* stabsread.c (cleanup_undefined_types_noname)
(cleanup_undefined_types_1): Make them static.
* symfile.c (place_section): Make it static.
* symtab.c (find_pc_sect_psymtab_closer): Make it static.
* target-descriptions.c (_initialize_target_descriptions): Declare
before definition.
* target.c (default_get_ada_task_ptid, find_default_can_async_p)
(find_default_is_async_p, find_default_supports_non_stop): Make
them static.
(target_supports_non_stop): Add prototype.
(dummy_pid_to_str): Make it static.
* utils.c (_initialize_utils): Declare before definition.
* ada-exp.y (_initialize_ada_exp): Declare before definition.
* solib-svr4.c (HAS_LM_DYNAMIC_FROM_LINK_MAP): Add a prototype.
* target.h (struct target_ops): Add a prototype to the
to_can_execute_reverse callback.
* macroscope.c (_initialize_macroscope): Declare before definition.
* cp-namespace.c (_initialize_cp_namespace): Declare before definition.
* python/python.c (_initialize_python): Declare before definition.
* tui/tui-command.c: Include "tui/tui-command.h".
* tui/tui-data.c (init_content_element, init_win_info): Make them
static.
* tui/tui-disasm.c: Include "tui/tui-disasm.h".
* tui/tui-interp.c (_initialize_tui_interp): Declare before
definition.
* tui/tui-layout.c: Include "tui/tui-layout.h".
(_initialize_tui_layout): Declare before definition.
* tui/tui-regs.c: Include "tui/tui-regs.h".
(tui_display_reg_element_at_line): Make it static.
(_initialize_tui_regs): Declare before definition.
* tui/tui-stack.c (_initialize_tui_stack): Declare before
definition.
* tui/tui-win.c: Include "tui/tui-win.h".
(_initialize_tui_win): Declare before definition.
(tui_sigwinch_handler): Make it static. Wrap in ifdef SIGWINCH.
* tui/tui-win.h (tui_sigwinch_handler): Delete declaration.
(tui_get_cmd_list): Add a prototype.
* tui/tui-windata.c: Include tui-windata.h.
* tui/tui-wingeneral.c (box_win): Make it static.
* cli/cli-logging.c (show_logging_command): Make it static.
(_initialize_cli_logging): Declare before definition.
* mi/mi-common.c (_initialize_gdb_mi_common): Declare before
definition.
2009-02-22 00:14:50 +08:00
|
|
|
|
static struct value *
|
2009-02-07 06:59:01 +08:00
|
|
|
|
siginfo_make_value (struct internalvar *var)
|
|
|
|
|
{
|
|
|
|
|
struct type *type;
|
|
|
|
|
struct gdbarch *gdbarch;
|
|
|
|
|
|
|
|
|
|
if (target_has_stack
|
|
|
|
|
&& !ptid_equal (inferior_ptid, null_ptid))
|
|
|
|
|
{
|
|
|
|
|
gdbarch = get_frame_arch (get_current_frame ());
|
|
|
|
|
|
|
|
|
|
if (gdbarch_get_siginfo_type_p (gdbarch))
|
|
|
|
|
{
|
|
|
|
|
type = gdbarch_get_siginfo_type (gdbarch);
|
|
|
|
|
|
|
|
|
|
return allocate_computed_value (type, &siginfo_value_funcs, NULL);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return allocate_value (builtin_type_void);
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
* dummy-frame.c (dummy_frame): Replace regcache member with
caller_state.
(dummy_frame_push): Replace caller_regcache arg with caller_state.
All callers updated.
(remove_dummy_frame,pop_dummy_frame,lookup_dummy_frame): New fns.
(dummy_frame_pop): Rewrite. Verify requested frame is in the
dummy frame stack. Restore program state.
(cleanup_dummy_frames): Rewrite.
(dummy_frame_sniffer): Update. Make static.
* dummy-frame.h (regcache,frame_info): Delete forward decls.
(inferior_thread_state): New forward decl.
(dummy_frame_push): Update prototype.
* frame.c (frame_pop): dummy_frame_pop now does all the work for
DUMMY_FRAMEs.
* infcall.c (breakpoint_auto_delete_contents): Delete.
(get_function_name,run_inferior_call): New fns.
(call_function_by_hand): Simplify by moving some code to
get_function_name, run_inferior_call. Inferior function call wrapped
in TRY_CATCH so there's less need for cleanups and all exits from
proceed are handled similarily. Detect program exit.
Detect program stopping in a different thread.
Make error messages more consistent.
* inferior.h (inferior_thread_state): Declare (opaque type).
(save_inferior_thread_state,restore_inferior_thread_state,
make_cleanup_restore_inferior_thread_state,
discard_inferior_thread_state, get_inferior_thread_state_regcache):
Declare.
(save_inferior_status): Update prototype.
* infrun.c: (normal_stop): When stopped for the completion of an
inferior function call, verify the expected stack frame kind.
(inferior_thread_state): New struct.
(save_inferior_thread_state,restore_inferior_thread_state,
do_restore_inferior_thread_state_cleanup,
make_cleanup_restore_inferior_thread_state,
discard_inferior_thread_state,
get_inferior_thread_state_regcache): New functions.
(inferior_status): Move stop_signal, stop_pc, registers to
inferior_thread_state. Remove restore_stack_info.
(save_inferior_status): Remove arg restore_stack_info.
All callers updated. Remove saving of state now saved by
save_inferior_thread_state.
(restore_inferior_status): Remove restoration of state now done by
restore_inferior_thread_state.
(discard_inferior_status): Remove freeing of registers, now done by
discard_inferior_thread_state.
* gdb.base/break.exp: Update expected gdb output.
* gdb.base/sepdebug.exp: Ditto.
* gdb.mi/mi-syn-frame.exp: Ditto.
* gdb.mi/mi2-syn-frame.exp: Ditto.
* gdb.base/call-signal-resume.exp: New file.
* gdb.base/call-signals.c: New file.
* gdb.base/unwindonsignal.exp: New file.
* gdb.base/unwindonsignal.c: New file.
* gdb.threads/interrupted-hand-call.exp: New file.
* gdb.threads/interrupted-hand-call.c: New file.
* gdb.threads/thread-unwindonsignal.exp: New file.
2009-01-20 03:05:01 +08:00
|
|
|
|
/* Inferior thread state.
|
|
|
|
|
These are details related to the inferior itself, and don't include
|
|
|
|
|
things like what frame the user had selected or what gdb was doing
|
|
|
|
|
with the target at the time.
|
|
|
|
|
For inferior function calls these are things we want to restore
|
|
|
|
|
regardless of whether the function call successfully completes
|
|
|
|
|
or the dummy frame has to be manually popped. */
|
|
|
|
|
|
|
|
|
|
struct inferior_thread_state
|
1999-04-27 02:34:20 +08:00
|
|
|
|
{
|
|
|
|
|
enum target_signal stop_signal;
|
|
|
|
|
CORE_ADDR stop_pc;
|
* dummy-frame.c (dummy_frame): Replace regcache member with
caller_state.
(dummy_frame_push): Replace caller_regcache arg with caller_state.
All callers updated.
(remove_dummy_frame,pop_dummy_frame,lookup_dummy_frame): New fns.
(dummy_frame_pop): Rewrite. Verify requested frame is in the
dummy frame stack. Restore program state.
(cleanup_dummy_frames): Rewrite.
(dummy_frame_sniffer): Update. Make static.
* dummy-frame.h (regcache,frame_info): Delete forward decls.
(inferior_thread_state): New forward decl.
(dummy_frame_push): Update prototype.
* frame.c (frame_pop): dummy_frame_pop now does all the work for
DUMMY_FRAMEs.
* infcall.c (breakpoint_auto_delete_contents): Delete.
(get_function_name,run_inferior_call): New fns.
(call_function_by_hand): Simplify by moving some code to
get_function_name, run_inferior_call. Inferior function call wrapped
in TRY_CATCH so there's less need for cleanups and all exits from
proceed are handled similarily. Detect program exit.
Detect program stopping in a different thread.
Make error messages more consistent.
* inferior.h (inferior_thread_state): Declare (opaque type).
(save_inferior_thread_state,restore_inferior_thread_state,
make_cleanup_restore_inferior_thread_state,
discard_inferior_thread_state, get_inferior_thread_state_regcache):
Declare.
(save_inferior_status): Update prototype.
* infrun.c: (normal_stop): When stopped for the completion of an
inferior function call, verify the expected stack frame kind.
(inferior_thread_state): New struct.
(save_inferior_thread_state,restore_inferior_thread_state,
do_restore_inferior_thread_state_cleanup,
make_cleanup_restore_inferior_thread_state,
discard_inferior_thread_state,
get_inferior_thread_state_regcache): New functions.
(inferior_status): Move stop_signal, stop_pc, registers to
inferior_thread_state. Remove restore_stack_info.
(save_inferior_status): Remove arg restore_stack_info.
All callers updated. Remove saving of state now saved by
save_inferior_thread_state.
(restore_inferior_status): Remove restoration of state now done by
restore_inferior_thread_state.
(discard_inferior_status): Remove freeing of registers, now done by
discard_inferior_thread_state.
* gdb.base/break.exp: Update expected gdb output.
* gdb.base/sepdebug.exp: Ditto.
* gdb.mi/mi-syn-frame.exp: Ditto.
* gdb.mi/mi2-syn-frame.exp: Ditto.
* gdb.base/call-signal-resume.exp: New file.
* gdb.base/call-signals.c: New file.
* gdb.base/unwindonsignal.exp: New file.
* gdb.base/unwindonsignal.c: New file.
* gdb.threads/interrupted-hand-call.exp: New file.
* gdb.threads/interrupted-hand-call.c: New file.
* gdb.threads/thread-unwindonsignal.exp: New file.
2009-01-20 03:05:01 +08:00
|
|
|
|
struct regcache *registers;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct inferior_thread_state *
|
|
|
|
|
save_inferior_thread_state (void)
|
|
|
|
|
{
|
|
|
|
|
struct inferior_thread_state *inf_state = XMALLOC (struct inferior_thread_state);
|
|
|
|
|
struct thread_info *tp = inferior_thread ();
|
|
|
|
|
|
|
|
|
|
inf_state->stop_signal = tp->stop_signal;
|
|
|
|
|
inf_state->stop_pc = stop_pc;
|
|
|
|
|
|
|
|
|
|
inf_state->registers = regcache_dup (get_current_regcache ());
|
|
|
|
|
|
|
|
|
|
return inf_state;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Restore inferior session state to INF_STATE. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
restore_inferior_thread_state (struct inferior_thread_state *inf_state)
|
|
|
|
|
{
|
|
|
|
|
struct thread_info *tp = inferior_thread ();
|
|
|
|
|
|
|
|
|
|
tp->stop_signal = inf_state->stop_signal;
|
|
|
|
|
stop_pc = inf_state->stop_pc;
|
|
|
|
|
|
|
|
|
|
/* The inferior can be gone if the user types "print exit(0)"
|
|
|
|
|
(and perhaps other times). */
|
|
|
|
|
if (target_has_execution)
|
|
|
|
|
/* NB: The register write goes through to the target. */
|
|
|
|
|
regcache_cpy (get_current_regcache (), inf_state->registers);
|
|
|
|
|
regcache_xfree (inf_state->registers);
|
|
|
|
|
xfree (inf_state);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
do_restore_inferior_thread_state_cleanup (void *state)
|
|
|
|
|
{
|
|
|
|
|
restore_inferior_thread_state (state);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct cleanup *
|
|
|
|
|
make_cleanup_restore_inferior_thread_state (struct inferior_thread_state *inf_state)
|
|
|
|
|
{
|
|
|
|
|
return make_cleanup (do_restore_inferior_thread_state_cleanup, inf_state);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
discard_inferior_thread_state (struct inferior_thread_state *inf_state)
|
|
|
|
|
{
|
|
|
|
|
regcache_xfree (inf_state->registers);
|
|
|
|
|
xfree (inf_state);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct regcache *
|
|
|
|
|
get_inferior_thread_state_regcache (struct inferior_thread_state *inf_state)
|
|
|
|
|
{
|
|
|
|
|
return inf_state->registers;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Session related state for inferior function calls.
|
|
|
|
|
These are the additional bits of state that need to be restored
|
|
|
|
|
when an inferior function call successfully completes. */
|
|
|
|
|
|
|
|
|
|
struct inferior_status
|
|
|
|
|
{
|
1999-04-27 02:34:20 +08:00
|
|
|
|
bpstat stop_bpstat;
|
|
|
|
|
int stop_step;
|
|
|
|
|
int stop_stack_dummy;
|
|
|
|
|
int stopped_by_random_signal;
|
2007-12-06 20:57:51 +08:00
|
|
|
|
int stepping_over_breakpoint;
|
1999-04-27 02:34:20 +08:00
|
|
|
|
CORE_ADDR step_range_start;
|
|
|
|
|
CORE_ADDR step_range_end;
|
2002-12-06 15:35:55 +08:00
|
|
|
|
struct frame_id step_frame_id;
|
2000-11-11 03:27:45 +08:00
|
|
|
|
enum step_over_calls_kind step_over_calls;
|
1999-04-27 02:34:20 +08:00
|
|
|
|
CORE_ADDR step_resume_break_address;
|
|
|
|
|
int stop_after_trap;
|
2003-04-09 03:21:15 +08:00
|
|
|
|
int stop_soon;
|
1999-04-27 02:34:20 +08:00
|
|
|
|
|
* dummy-frame.c (dummy_frame): Replace regcache member with
caller_state.
(dummy_frame_push): Replace caller_regcache arg with caller_state.
All callers updated.
(remove_dummy_frame,pop_dummy_frame,lookup_dummy_frame): New fns.
(dummy_frame_pop): Rewrite. Verify requested frame is in the
dummy frame stack. Restore program state.
(cleanup_dummy_frames): Rewrite.
(dummy_frame_sniffer): Update. Make static.
* dummy-frame.h (regcache,frame_info): Delete forward decls.
(inferior_thread_state): New forward decl.
(dummy_frame_push): Update prototype.
* frame.c (frame_pop): dummy_frame_pop now does all the work for
DUMMY_FRAMEs.
* infcall.c (breakpoint_auto_delete_contents): Delete.
(get_function_name,run_inferior_call): New fns.
(call_function_by_hand): Simplify by moving some code to
get_function_name, run_inferior_call. Inferior function call wrapped
in TRY_CATCH so there's less need for cleanups and all exits from
proceed are handled similarily. Detect program exit.
Detect program stopping in a different thread.
Make error messages more consistent.
* inferior.h (inferior_thread_state): Declare (opaque type).
(save_inferior_thread_state,restore_inferior_thread_state,
make_cleanup_restore_inferior_thread_state,
discard_inferior_thread_state, get_inferior_thread_state_regcache):
Declare.
(save_inferior_status): Update prototype.
* infrun.c: (normal_stop): When stopped for the completion of an
inferior function call, verify the expected stack frame kind.
(inferior_thread_state): New struct.
(save_inferior_thread_state,restore_inferior_thread_state,
do_restore_inferior_thread_state_cleanup,
make_cleanup_restore_inferior_thread_state,
discard_inferior_thread_state,
get_inferior_thread_state_regcache): New functions.
(inferior_status): Move stop_signal, stop_pc, registers to
inferior_thread_state. Remove restore_stack_info.
(save_inferior_status): Remove arg restore_stack_info.
All callers updated. Remove saving of state now saved by
save_inferior_thread_state.
(restore_inferior_status): Remove restoration of state now done by
restore_inferior_thread_state.
(discard_inferior_status): Remove freeing of registers, now done by
discard_inferior_thread_state.
* gdb.base/break.exp: Update expected gdb output.
* gdb.base/sepdebug.exp: Ditto.
* gdb.mi/mi-syn-frame.exp: Ditto.
* gdb.mi/mi2-syn-frame.exp: Ditto.
* gdb.base/call-signal-resume.exp: New file.
* gdb.base/call-signals.c: New file.
* gdb.base/unwindonsignal.exp: New file.
* gdb.base/unwindonsignal.c: New file.
* gdb.threads/interrupted-hand-call.exp: New file.
* gdb.threads/interrupted-hand-call.c: New file.
* gdb.threads/thread-unwindonsignal.exp: New file.
2009-01-20 03:05:01 +08:00
|
|
|
|
/* ID if the selected frame when the inferior function call was made. */
|
2002-06-11 07:25:50 +08:00
|
|
|
|
struct frame_id selected_frame_id;
|
|
|
|
|
|
1999-04-27 02:34:20 +08:00
|
|
|
|
int proceed_to_finish;
|
2009-03-23 01:59:59 +08:00
|
|
|
|
int in_infcall;
|
1999-04-27 02:34:20 +08:00
|
|
|
|
};
|
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
/* Save all of the information associated with the inferior<==>gdb
|
* dummy-frame.c (dummy_frame): Replace regcache member with
caller_state.
(dummy_frame_push): Replace caller_regcache arg with caller_state.
All callers updated.
(remove_dummy_frame,pop_dummy_frame,lookup_dummy_frame): New fns.
(dummy_frame_pop): Rewrite. Verify requested frame is in the
dummy frame stack. Restore program state.
(cleanup_dummy_frames): Rewrite.
(dummy_frame_sniffer): Update. Make static.
* dummy-frame.h (regcache,frame_info): Delete forward decls.
(inferior_thread_state): New forward decl.
(dummy_frame_push): Update prototype.
* frame.c (frame_pop): dummy_frame_pop now does all the work for
DUMMY_FRAMEs.
* infcall.c (breakpoint_auto_delete_contents): Delete.
(get_function_name,run_inferior_call): New fns.
(call_function_by_hand): Simplify by moving some code to
get_function_name, run_inferior_call. Inferior function call wrapped
in TRY_CATCH so there's less need for cleanups and all exits from
proceed are handled similarily. Detect program exit.
Detect program stopping in a different thread.
Make error messages more consistent.
* inferior.h (inferior_thread_state): Declare (opaque type).
(save_inferior_thread_state,restore_inferior_thread_state,
make_cleanup_restore_inferior_thread_state,
discard_inferior_thread_state, get_inferior_thread_state_regcache):
Declare.
(save_inferior_status): Update prototype.
* infrun.c: (normal_stop): When stopped for the completion of an
inferior function call, verify the expected stack frame kind.
(inferior_thread_state): New struct.
(save_inferior_thread_state,restore_inferior_thread_state,
do_restore_inferior_thread_state_cleanup,
make_cleanup_restore_inferior_thread_state,
discard_inferior_thread_state,
get_inferior_thread_state_regcache): New functions.
(inferior_status): Move stop_signal, stop_pc, registers to
inferior_thread_state. Remove restore_stack_info.
(save_inferior_status): Remove arg restore_stack_info.
All callers updated. Remove saving of state now saved by
save_inferior_thread_state.
(restore_inferior_status): Remove restoration of state now done by
restore_inferior_thread_state.
(discard_inferior_status): Remove freeing of registers, now done by
discard_inferior_thread_state.
* gdb.base/break.exp: Update expected gdb output.
* gdb.base/sepdebug.exp: Ditto.
* gdb.mi/mi-syn-frame.exp: Ditto.
* gdb.mi/mi2-syn-frame.exp: Ditto.
* gdb.base/call-signal-resume.exp: New file.
* gdb.base/call-signals.c: New file.
* gdb.base/unwindonsignal.exp: New file.
* gdb.base/unwindonsignal.c: New file.
* gdb.threads/interrupted-hand-call.exp: New file.
* gdb.threads/interrupted-hand-call.c: New file.
* gdb.threads/thread-unwindonsignal.exp: New file.
2009-01-20 03:05:01 +08:00
|
|
|
|
connection. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
1999-04-27 02:34:20 +08:00
|
|
|
|
struct inferior_status *
|
* dummy-frame.c (dummy_frame): Replace regcache member with
caller_state.
(dummy_frame_push): Replace caller_regcache arg with caller_state.
All callers updated.
(remove_dummy_frame,pop_dummy_frame,lookup_dummy_frame): New fns.
(dummy_frame_pop): Rewrite. Verify requested frame is in the
dummy frame stack. Restore program state.
(cleanup_dummy_frames): Rewrite.
(dummy_frame_sniffer): Update. Make static.
* dummy-frame.h (regcache,frame_info): Delete forward decls.
(inferior_thread_state): New forward decl.
(dummy_frame_push): Update prototype.
* frame.c (frame_pop): dummy_frame_pop now does all the work for
DUMMY_FRAMEs.
* infcall.c (breakpoint_auto_delete_contents): Delete.
(get_function_name,run_inferior_call): New fns.
(call_function_by_hand): Simplify by moving some code to
get_function_name, run_inferior_call. Inferior function call wrapped
in TRY_CATCH so there's less need for cleanups and all exits from
proceed are handled similarily. Detect program exit.
Detect program stopping in a different thread.
Make error messages more consistent.
* inferior.h (inferior_thread_state): Declare (opaque type).
(save_inferior_thread_state,restore_inferior_thread_state,
make_cleanup_restore_inferior_thread_state,
discard_inferior_thread_state, get_inferior_thread_state_regcache):
Declare.
(save_inferior_status): Update prototype.
* infrun.c: (normal_stop): When stopped for the completion of an
inferior function call, verify the expected stack frame kind.
(inferior_thread_state): New struct.
(save_inferior_thread_state,restore_inferior_thread_state,
do_restore_inferior_thread_state_cleanup,
make_cleanup_restore_inferior_thread_state,
discard_inferior_thread_state,
get_inferior_thread_state_regcache): New functions.
(inferior_status): Move stop_signal, stop_pc, registers to
inferior_thread_state. Remove restore_stack_info.
(save_inferior_status): Remove arg restore_stack_info.
All callers updated. Remove saving of state now saved by
save_inferior_thread_state.
(restore_inferior_status): Remove restoration of state now done by
restore_inferior_thread_state.
(discard_inferior_status): Remove freeing of registers, now done by
discard_inferior_thread_state.
* gdb.base/break.exp: Update expected gdb output.
* gdb.base/sepdebug.exp: Ditto.
* gdb.mi/mi-syn-frame.exp: Ditto.
* gdb.mi/mi2-syn-frame.exp: Ditto.
* gdb.base/call-signal-resume.exp: New file.
* gdb.base/call-signals.c: New file.
* gdb.base/unwindonsignal.exp: New file.
* gdb.base/unwindonsignal.c: New file.
* gdb.threads/interrupted-hand-call.exp: New file.
* gdb.threads/interrupted-hand-call.c: New file.
* gdb.threads/thread-unwindonsignal.exp: New file.
2009-01-20 03:05:01 +08:00
|
|
|
|
save_inferior_status (void)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
2002-06-26 02:38:57 +08:00
|
|
|
|
struct inferior_status *inf_status = XMALLOC (struct inferior_status);
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
struct thread_info *tp = inferior_thread ();
|
2008-09-22 23:20:08 +08:00
|
|
|
|
struct inferior *inf = current_inferior ();
|
1999-04-27 02:34:20 +08:00
|
|
|
|
|
2008-09-09 05:55:16 +08:00
|
|
|
|
inf_status->stop_step = tp->stop_step;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
inf_status->stop_stack_dummy = stop_stack_dummy;
|
|
|
|
|
inf_status->stopped_by_random_signal = stopped_by_random_signal;
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
inf_status->stepping_over_breakpoint = tp->trap_expected;
|
|
|
|
|
inf_status->step_range_start = tp->step_range_start;
|
|
|
|
|
inf_status->step_range_end = tp->step_range_end;
|
|
|
|
|
inf_status->step_frame_id = tp->step_frame_id;
|
2008-09-09 05:43:00 +08:00
|
|
|
|
inf_status->step_over_calls = tp->step_over_calls;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
inf_status->stop_after_trap = stop_after_trap;
|
2008-09-22 23:20:08 +08:00
|
|
|
|
inf_status->stop_soon = inf->stop_soon;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
/* Save original bpstat chain here; replace it with copy of chain.
|
|
|
|
|
If caller's caller is walking the chain, they'll be happier if we
|
1999-04-27 02:34:20 +08:00
|
|
|
|
hand them back the original chain when restore_inferior_status is
|
|
|
|
|
called. */
|
2008-09-09 05:46:21 +08:00
|
|
|
|
inf_status->stop_bpstat = tp->stop_bpstat;
|
|
|
|
|
tp->stop_bpstat = bpstat_copy (tp->stop_bpstat);
|
2008-09-09 05:48:52 +08:00
|
|
|
|
inf_status->proceed_to_finish = tp->proceed_to_finish;
|
2009-03-23 01:59:59 +08:00
|
|
|
|
inf_status->in_infcall = tp->in_infcall;
|
1999-07-08 04:19:36 +08:00
|
|
|
|
|
* frame.c (deprecated_selected_frame): Rename to...
(selected_frame): ...this. Make static.
(get_selected_frame, select_frame): Update.
* frame.h (deprected_select_frame): Delete.
(deprecated_safe_get_selected_frame): Update comments.
* breakpoint.c, cli/cli-cmds.c, f-valprint.c, infcmd.c, inflow.c,
infrun.c, stack.c, tui/tui-disasm.c, tui/tui-source.c,
tui/tui-winsource.c, valops.c, varobj.c, findvar.c, macroscope.c,
parse.c, regcache.h, sh64-tdep.c, tui/tui-hooks.c, tui/tui-win.c,
tui/tui.c: Replace references to deprecated_selected_frame.
2007-02-28 03:46:04 +08:00
|
|
|
|
inf_status->selected_frame_id = get_frame_id (get_selected_frame (NULL));
|
* dummy-frame.c (dummy_frame): Replace regcache member with
caller_state.
(dummy_frame_push): Replace caller_regcache arg with caller_state.
All callers updated.
(remove_dummy_frame,pop_dummy_frame,lookup_dummy_frame): New fns.
(dummy_frame_pop): Rewrite. Verify requested frame is in the
dummy frame stack. Restore program state.
(cleanup_dummy_frames): Rewrite.
(dummy_frame_sniffer): Update. Make static.
* dummy-frame.h (regcache,frame_info): Delete forward decls.
(inferior_thread_state): New forward decl.
(dummy_frame_push): Update prototype.
* frame.c (frame_pop): dummy_frame_pop now does all the work for
DUMMY_FRAMEs.
* infcall.c (breakpoint_auto_delete_contents): Delete.
(get_function_name,run_inferior_call): New fns.
(call_function_by_hand): Simplify by moving some code to
get_function_name, run_inferior_call. Inferior function call wrapped
in TRY_CATCH so there's less need for cleanups and all exits from
proceed are handled similarily. Detect program exit.
Detect program stopping in a different thread.
Make error messages more consistent.
* inferior.h (inferior_thread_state): Declare (opaque type).
(save_inferior_thread_state,restore_inferior_thread_state,
make_cleanup_restore_inferior_thread_state,
discard_inferior_thread_state, get_inferior_thread_state_regcache):
Declare.
(save_inferior_status): Update prototype.
* infrun.c: (normal_stop): When stopped for the completion of an
inferior function call, verify the expected stack frame kind.
(inferior_thread_state): New struct.
(save_inferior_thread_state,restore_inferior_thread_state,
do_restore_inferior_thread_state_cleanup,
make_cleanup_restore_inferior_thread_state,
discard_inferior_thread_state,
get_inferior_thread_state_regcache): New functions.
(inferior_status): Move stop_signal, stop_pc, registers to
inferior_thread_state. Remove restore_stack_info.
(save_inferior_status): Remove arg restore_stack_info.
All callers updated. Remove saving of state now saved by
save_inferior_thread_state.
(restore_inferior_status): Remove restoration of state now done by
restore_inferior_thread_state.
(discard_inferior_status): Remove freeing of registers, now done by
discard_inferior_thread_state.
* gdb.base/break.exp: Update expected gdb output.
* gdb.base/sepdebug.exp: Ditto.
* gdb.mi/mi-syn-frame.exp: Ditto.
* gdb.mi/mi2-syn-frame.exp: Ditto.
* gdb.base/call-signal-resume.exp: New file.
* gdb.base/call-signals.c: New file.
* gdb.base/unwindonsignal.exp: New file.
* gdb.base/unwindonsignal.c: New file.
* gdb.threads/interrupted-hand-call.exp: New file.
* gdb.threads/interrupted-hand-call.c: New file.
* gdb.threads/thread-unwindonsignal.exp: New file.
2009-01-20 03:05:01 +08:00
|
|
|
|
|
1999-04-27 02:34:20 +08:00
|
|
|
|
return inf_status;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
1999-08-10 05:36:23 +08:00
|
|
|
|
restore_selected_frame (void *args)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
2002-07-19 01:53:50 +08:00
|
|
|
|
struct frame_id *fid = (struct frame_id *) args;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
struct frame_info *frame;
|
|
|
|
|
|
2002-06-11 07:25:50 +08:00
|
|
|
|
frame = frame_find_by_id (*fid);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2002-12-06 15:35:55 +08:00
|
|
|
|
/* If inf_status->selected_frame_id is NULL, there was no previously
|
|
|
|
|
selected frame. */
|
2002-06-11 07:25:50 +08:00
|
|
|
|
if (frame == NULL)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 12:06:14 +08:00
|
|
|
|
warning (_("Unable to restore previously selected frame."));
|
1999-04-16 09:35:26 +08:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2002-05-05 09:15:13 +08:00
|
|
|
|
select_frame (frame);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
|
|
return (1);
|
|
|
|
|
}
|
|
|
|
|
|
* dummy-frame.c (dummy_frame): Replace regcache member with
caller_state.
(dummy_frame_push): Replace caller_regcache arg with caller_state.
All callers updated.
(remove_dummy_frame,pop_dummy_frame,lookup_dummy_frame): New fns.
(dummy_frame_pop): Rewrite. Verify requested frame is in the
dummy frame stack. Restore program state.
(cleanup_dummy_frames): Rewrite.
(dummy_frame_sniffer): Update. Make static.
* dummy-frame.h (regcache,frame_info): Delete forward decls.
(inferior_thread_state): New forward decl.
(dummy_frame_push): Update prototype.
* frame.c (frame_pop): dummy_frame_pop now does all the work for
DUMMY_FRAMEs.
* infcall.c (breakpoint_auto_delete_contents): Delete.
(get_function_name,run_inferior_call): New fns.
(call_function_by_hand): Simplify by moving some code to
get_function_name, run_inferior_call. Inferior function call wrapped
in TRY_CATCH so there's less need for cleanups and all exits from
proceed are handled similarily. Detect program exit.
Detect program stopping in a different thread.
Make error messages more consistent.
* inferior.h (inferior_thread_state): Declare (opaque type).
(save_inferior_thread_state,restore_inferior_thread_state,
make_cleanup_restore_inferior_thread_state,
discard_inferior_thread_state, get_inferior_thread_state_regcache):
Declare.
(save_inferior_status): Update prototype.
* infrun.c: (normal_stop): When stopped for the completion of an
inferior function call, verify the expected stack frame kind.
(inferior_thread_state): New struct.
(save_inferior_thread_state,restore_inferior_thread_state,
do_restore_inferior_thread_state_cleanup,
make_cleanup_restore_inferior_thread_state,
discard_inferior_thread_state,
get_inferior_thread_state_regcache): New functions.
(inferior_status): Move stop_signal, stop_pc, registers to
inferior_thread_state. Remove restore_stack_info.
(save_inferior_status): Remove arg restore_stack_info.
All callers updated. Remove saving of state now saved by
save_inferior_thread_state.
(restore_inferior_status): Remove restoration of state now done by
restore_inferior_thread_state.
(discard_inferior_status): Remove freeing of registers, now done by
discard_inferior_thread_state.
* gdb.base/break.exp: Update expected gdb output.
* gdb.base/sepdebug.exp: Ditto.
* gdb.mi/mi-syn-frame.exp: Ditto.
* gdb.mi/mi2-syn-frame.exp: Ditto.
* gdb.base/call-signal-resume.exp: New file.
* gdb.base/call-signals.c: New file.
* gdb.base/unwindonsignal.exp: New file.
* gdb.base/unwindonsignal.c: New file.
* gdb.threads/interrupted-hand-call.exp: New file.
* gdb.threads/interrupted-hand-call.c: New file.
* gdb.threads/thread-unwindonsignal.exp: New file.
2009-01-20 03:05:01 +08:00
|
|
|
|
/* Restore inferior session state to INF_STATUS. */
|
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
void
|
1999-08-10 05:36:23 +08:00
|
|
|
|
restore_inferior_status (struct inferior_status *inf_status)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
struct thread_info *tp = inferior_thread ();
|
2008-09-22 23:20:08 +08:00
|
|
|
|
struct inferior *inf = current_inferior ();
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
|
2008-09-09 05:55:16 +08:00
|
|
|
|
tp->stop_step = inf_status->stop_step;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
stop_stack_dummy = inf_status->stop_stack_dummy;
|
|
|
|
|
stopped_by_random_signal = inf_status->stopped_by_random_signal;
|
Remove context switching in favour of accessing thread_info fields
directly.
* infrun.c (stepping_over_breakpoint, step_resume_breakpoint):
Delete.
(struct thread_stepping_state): Delete.
(gtss, tss): Delete.
(follow_inferior_reset_breakpoints, follow_exec)
(resume, clear_proceed_status): Adjust.
(prev_pc): Delete.
(proceed, start_remote, init_wait_for_inferior): Adjust.
(struct execution_control_state): Add event_thread member.
(delete_step_resume_breakpoint_callback)
(delete_step_thread_step_resume_breakpoint)
(delete_step_thread_step_resume_breakpoint_cleanup)
(delete_step_thread_step_resume_breakpoint): New.
(wait_for_inferior, init_execution_control_state): Use
delete_step_thread_step_resume_breakpoint_cleanup.
(wait_for_inferior): Set the event_thread.
(fetch_inferior_event): Ditto. Delete the step-resume breakpoint
with delete_step_thread_step_resume_breakpoint.
(init_thread_stepping_state): Change parameter type to
thread_info. Adjust.
(context_switch): Don't context switch prev_pc,
stepping_over_breakpoint, step_resume_breakpoint,
step_range_start, step_range_end, step_frame_id,
tss->stepping_over_breakpoint,
tss->stepping_through_solib_after_catch,
tss->stepping_through_solib_catchpoints, tss->current_line, or
tss->current_symtab.
(adjust_pc_after_break, handle_inferior_event)
(currently_stepping, step_into_function)
(insert_step_resume_breakpoint_at_sal)
(insert_longjmp_resume_breakpoint, keep_going): Adjust.
(clear_stepping_state): New.
(normal_stop): Adjust.
(save_inferior_status, restore_inferior_status): Adjust.
* gdbthread.h (struct thread_info): Comments describing the
members moved here. Add step_after_step_resume_breakpoint.
(delete_step_resume_breakpoint): Add thread_info argument.
(save_infrun_state, load_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, another_trap,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab function arguments.
(inferior_thread): Declare.
* thread.c (inferior_thread): New.
(delete_step_resume_breakpoint): Add a thread_info parameter and
rewrite.
(load_infrun_state, save_infrun_state): Remove prev_pc,
trap_expected, step_resume_breakpoint, step_range_start,
step_range_end, step_frame_id, stepping_over_breakpoint,
stepping_through_solib_after_catch,
stepping_through_solib_catchpoints, current_line and
current_symtab args. Remove code referencing them.
* infcmd.c (step_range_start, step_range_end, step_frame_id):
Delete.
(step_1, step_once, until_next_command): Adjust.
* inferior.h (step_range_start, step_range_end, step_frame_id):
Delete.
* linux-nat.c (linux_child_follow_fork): If following the child,
move the step state to it. Adjust.
* inf-ptrace.c (inf_ptrace_follow_fork): Ditto.
* inf-ttrace.c (inf_ttrace_follow_fork): Ditto.
2008-09-09 05:40:39 +08:00
|
|
|
|
tp->trap_expected = inf_status->stepping_over_breakpoint;
|
|
|
|
|
tp->step_range_start = inf_status->step_range_start;
|
|
|
|
|
tp->step_range_end = inf_status->step_range_end;
|
|
|
|
|
tp->step_frame_id = inf_status->step_frame_id;
|
2008-09-09 05:43:00 +08:00
|
|
|
|
tp->step_over_calls = inf_status->step_over_calls;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
stop_after_trap = inf_status->stop_after_trap;
|
2008-09-22 23:20:08 +08:00
|
|
|
|
inf->stop_soon = inf_status->stop_soon;
|
2008-09-09 05:46:21 +08:00
|
|
|
|
bpstat_clear (&tp->stop_bpstat);
|
|
|
|
|
tp->stop_bpstat = inf_status->stop_bpstat;
|
* dummy-frame.c (dummy_frame): Replace regcache member with
caller_state.
(dummy_frame_push): Replace caller_regcache arg with caller_state.
All callers updated.
(remove_dummy_frame,pop_dummy_frame,lookup_dummy_frame): New fns.
(dummy_frame_pop): Rewrite. Verify requested frame is in the
dummy frame stack. Restore program state.
(cleanup_dummy_frames): Rewrite.
(dummy_frame_sniffer): Update. Make static.
* dummy-frame.h (regcache,frame_info): Delete forward decls.
(inferior_thread_state): New forward decl.
(dummy_frame_push): Update prototype.
* frame.c (frame_pop): dummy_frame_pop now does all the work for
DUMMY_FRAMEs.
* infcall.c (breakpoint_auto_delete_contents): Delete.
(get_function_name,run_inferior_call): New fns.
(call_function_by_hand): Simplify by moving some code to
get_function_name, run_inferior_call. Inferior function call wrapped
in TRY_CATCH so there's less need for cleanups and all exits from
proceed are handled similarily. Detect program exit.
Detect program stopping in a different thread.
Make error messages more consistent.
* inferior.h (inferior_thread_state): Declare (opaque type).
(save_inferior_thread_state,restore_inferior_thread_state,
make_cleanup_restore_inferior_thread_state,
discard_inferior_thread_state, get_inferior_thread_state_regcache):
Declare.
(save_inferior_status): Update prototype.
* infrun.c: (normal_stop): When stopped for the completion of an
inferior function call, verify the expected stack frame kind.
(inferior_thread_state): New struct.
(save_inferior_thread_state,restore_inferior_thread_state,
do_restore_inferior_thread_state_cleanup,
make_cleanup_restore_inferior_thread_state,
discard_inferior_thread_state,
get_inferior_thread_state_regcache): New functions.
(inferior_status): Move stop_signal, stop_pc, registers to
inferior_thread_state. Remove restore_stack_info.
(save_inferior_status): Remove arg restore_stack_info.
All callers updated. Remove saving of state now saved by
save_inferior_thread_state.
(restore_inferior_status): Remove restoration of state now done by
restore_inferior_thread_state.
(discard_inferior_status): Remove freeing of registers, now done by
discard_inferior_thread_state.
* gdb.base/break.exp: Update expected gdb output.
* gdb.base/sepdebug.exp: Ditto.
* gdb.mi/mi-syn-frame.exp: Ditto.
* gdb.mi/mi2-syn-frame.exp: Ditto.
* gdb.base/call-signal-resume.exp: New file.
* gdb.base/call-signals.c: New file.
* gdb.base/unwindonsignal.exp: New file.
* gdb.base/unwindonsignal.c: New file.
* gdb.threads/interrupted-hand-call.exp: New file.
* gdb.threads/interrupted-hand-call.c: New file.
* gdb.threads/thread-unwindonsignal.exp: New file.
2009-01-20 03:05:01 +08:00
|
|
|
|
inf_status->stop_bpstat = NULL;
|
2008-09-09 05:48:52 +08:00
|
|
|
|
tp->proceed_to_finish = inf_status->proceed_to_finish;
|
2009-03-23 01:59:59 +08:00
|
|
|
|
tp->in_infcall = inf_status->in_infcall;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
* dummy-frame.c (dummy_frame): Replace regcache member with
caller_state.
(dummy_frame_push): Replace caller_regcache arg with caller_state.
All callers updated.
(remove_dummy_frame,pop_dummy_frame,lookup_dummy_frame): New fns.
(dummy_frame_pop): Rewrite. Verify requested frame is in the
dummy frame stack. Restore program state.
(cleanup_dummy_frames): Rewrite.
(dummy_frame_sniffer): Update. Make static.
* dummy-frame.h (regcache,frame_info): Delete forward decls.
(inferior_thread_state): New forward decl.
(dummy_frame_push): Update prototype.
* frame.c (frame_pop): dummy_frame_pop now does all the work for
DUMMY_FRAMEs.
* infcall.c (breakpoint_auto_delete_contents): Delete.
(get_function_name,run_inferior_call): New fns.
(call_function_by_hand): Simplify by moving some code to
get_function_name, run_inferior_call. Inferior function call wrapped
in TRY_CATCH so there's less need for cleanups and all exits from
proceed are handled similarily. Detect program exit.
Detect program stopping in a different thread.
Make error messages more consistent.
* inferior.h (inferior_thread_state): Declare (opaque type).
(save_inferior_thread_state,restore_inferior_thread_state,
make_cleanup_restore_inferior_thread_state,
discard_inferior_thread_state, get_inferior_thread_state_regcache):
Declare.
(save_inferior_status): Update prototype.
* infrun.c: (normal_stop): When stopped for the completion of an
inferior function call, verify the expected stack frame kind.
(inferior_thread_state): New struct.
(save_inferior_thread_state,restore_inferior_thread_state,
do_restore_inferior_thread_state_cleanup,
make_cleanup_restore_inferior_thread_state,
discard_inferior_thread_state,
get_inferior_thread_state_regcache): New functions.
(inferior_status): Move stop_signal, stop_pc, registers to
inferior_thread_state. Remove restore_stack_info.
(save_inferior_status): Remove arg restore_stack_info.
All callers updated. Remove saving of state now saved by
save_inferior_thread_state.
(restore_inferior_status): Remove restoration of state now done by
restore_inferior_thread_state.
(discard_inferior_status): Remove freeing of registers, now done by
discard_inferior_thread_state.
* gdb.base/break.exp: Update expected gdb output.
* gdb.base/sepdebug.exp: Ditto.
* gdb.mi/mi-syn-frame.exp: Ditto.
* gdb.mi/mi2-syn-frame.exp: Ditto.
* gdb.base/call-signal-resume.exp: New file.
* gdb.base/call-signals.c: New file.
* gdb.base/unwindonsignal.exp: New file.
* gdb.base/unwindonsignal.c: New file.
* gdb.threads/interrupted-hand-call.exp: New file.
* gdb.threads/interrupted-hand-call.c: New file.
* gdb.threads/thread-unwindonsignal.exp: New file.
2009-01-20 03:05:01 +08:00
|
|
|
|
if (target_has_stack)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
|
|
|
|
/* The point of catch_errors is that if the stack is clobbered,
|
2002-06-11 07:25:50 +08:00
|
|
|
|
walking the stack might encounter a garbage pointer and
|
|
|
|
|
error() trying to dereference it. */
|
2002-07-19 01:53:50 +08:00
|
|
|
|
if (catch_errors
|
|
|
|
|
(restore_selected_frame, &inf_status->selected_frame_id,
|
|
|
|
|
"Unable to restore previously selected frame:\n",
|
|
|
|
|
RETURN_MASK_ERROR) == 0)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
/* Error in restoring the selected frame. Select the innermost
|
|
|
|
|
frame. */
|
2002-05-05 09:15:13 +08:00
|
|
|
|
select_frame (get_current_frame ());
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
2002-06-26 02:38:57 +08:00
|
|
|
|
xfree (inf_status);
|
1999-04-27 02:34:20 +08:00
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2000-05-22 17:02:23 +08:00
|
|
|
|
static void
|
|
|
|
|
do_restore_inferior_status_cleanup (void *sts)
|
|
|
|
|
{
|
|
|
|
|
restore_inferior_status (sts);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct cleanup *
|
|
|
|
|
make_cleanup_restore_inferior_status (struct inferior_status *inf_status)
|
|
|
|
|
{
|
|
|
|
|
return make_cleanup (do_restore_inferior_status_cleanup, inf_status);
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
void
|
1999-08-10 05:36:23 +08:00
|
|
|
|
discard_inferior_status (struct inferior_status *inf_status)
|
1999-04-27 02:34:20 +08:00
|
|
|
|
{
|
|
|
|
|
/* See save_inferior_status for info on stop_bpstat. */
|
|
|
|
|
bpstat_clear (&inf_status->stop_bpstat);
|
2002-06-26 02:38:57 +08:00
|
|
|
|
xfree (inf_status);
|
1999-04-27 02:34:20 +08:00
|
|
|
|
}
|
* dummy-frame.c (dummy_frame): Replace regcache member with
caller_state.
(dummy_frame_push): Replace caller_regcache arg with caller_state.
All callers updated.
(remove_dummy_frame,pop_dummy_frame,lookup_dummy_frame): New fns.
(dummy_frame_pop): Rewrite. Verify requested frame is in the
dummy frame stack. Restore program state.
(cleanup_dummy_frames): Rewrite.
(dummy_frame_sniffer): Update. Make static.
* dummy-frame.h (regcache,frame_info): Delete forward decls.
(inferior_thread_state): New forward decl.
(dummy_frame_push): Update prototype.
* frame.c (frame_pop): dummy_frame_pop now does all the work for
DUMMY_FRAMEs.
* infcall.c (breakpoint_auto_delete_contents): Delete.
(get_function_name,run_inferior_call): New fns.
(call_function_by_hand): Simplify by moving some code to
get_function_name, run_inferior_call. Inferior function call wrapped
in TRY_CATCH so there's less need for cleanups and all exits from
proceed are handled similarily. Detect program exit.
Detect program stopping in a different thread.
Make error messages more consistent.
* inferior.h (inferior_thread_state): Declare (opaque type).
(save_inferior_thread_state,restore_inferior_thread_state,
make_cleanup_restore_inferior_thread_state,
discard_inferior_thread_state, get_inferior_thread_state_regcache):
Declare.
(save_inferior_status): Update prototype.
* infrun.c: (normal_stop): When stopped for the completion of an
inferior function call, verify the expected stack frame kind.
(inferior_thread_state): New struct.
(save_inferior_thread_state,restore_inferior_thread_state,
do_restore_inferior_thread_state_cleanup,
make_cleanup_restore_inferior_thread_state,
discard_inferior_thread_state,
get_inferior_thread_state_regcache): New functions.
(inferior_status): Move stop_signal, stop_pc, registers to
inferior_thread_state. Remove restore_stack_info.
(save_inferior_status): Remove arg restore_stack_info.
All callers updated. Remove saving of state now saved by
save_inferior_thread_state.
(restore_inferior_status): Remove restoration of state now done by
restore_inferior_thread_state.
(discard_inferior_status): Remove freeing of registers, now done by
discard_inferior_thread_state.
* gdb.base/break.exp: Update expected gdb output.
* gdb.base/sepdebug.exp: Ditto.
* gdb.mi/mi-syn-frame.exp: Ditto.
* gdb.mi/mi2-syn-frame.exp: Ditto.
* gdb.base/call-signal-resume.exp: New file.
* gdb.base/call-signals.c: New file.
* gdb.base/unwindonsignal.exp: New file.
* gdb.base/unwindonsignal.c: New file.
* gdb.threads/interrupted-hand-call.exp: New file.
* gdb.threads/interrupted-hand-call.c: New file.
* gdb.threads/thread-unwindonsignal.exp: New file.
2009-01-20 03:05:01 +08:00
|
|
|
|
|
* breakpoint.c (bpstat_stop_status): Call inferior_has_forked,
inferior_has_vforked, and inferior_has_execd instead of
target_has_forked, target_has_vforked, and target_has_execd.
* config/pa/nm-hppah.h (CHILD_HAS_FORKED, CHILD_HAS_VFORKED)
(CHILD_HAS_EXECD, CHILD_HAS_SYSCALL_EVENT): Don't define.
(CHILD_WAIT): Define.
(child_wait): Add prototype.
* hppah-nat.c (hpux_has_forked): Rename from child_has_forked.
Add prototype.
(hpux_has_vforked): Likewise, from child_has_vforked.
(hpux_has_execd): Likewise, from child_has_execd.
(hpux_has_syscall_event): Likewise, from child_has_syscall_event.
(not_same_real_pid, child_wait): New, copied from inftarg.c.
Call hpux_has_forked, hpux_has_vforked, hpux_has_execd,
and hpux_has_syscall_event instead of the target hooks.
* infrun.c (inferior_has_forked, inferior_has_vforked)
(inferior_has_execd): New functions.
* inftarg.c (not_same_real_pid): Remove.
(child_wait): Remove references to not_same_real_pid,
target_has_forked, target_has_vforked, target_has_execd,
and target_has_syscall_event.
(child_has_forked, child_has_vforked, child_has_execd)
(child_has_syscall_event): Remove.
(init_child_ops): Remove references to child_has_forked,
child_has_vforked, child_has_execd, and child_has_syscall_event.
* infttrace.c (hpux_has_forked): Rename from child_has_forked.
(hpux_has_vforked): Likewise, from child_has_vforked.
(hpux_has_execd): Likewise, from child_has_execd.
(hpux_has_syscall_event): Likewise, from child_has_syscall_event.
* target.c (cleanup_target): Remove references to
to_has_forked, to_has_vforked, to_has_execd, and
to_has_syscall_event.
(update_current_target): Likewise.
(setup_target_debug): Likewise.
(debug_to_has_forked): Remove.
(debug_to_has_vforked): Remove.
(debug_to_has_execd): Remove.
(debug_to_has_syscall_event): Remove.
* target.h (struct target_ops): Remove to_has_forked.
to_has_vforked, to_has_execd, and to_has_syscall_event.
(child_has_forked, child_has_vforked, child_has_execd)
(child_has_syscall_event): Remove prototypes.
(inferior_has_forked, inferior_has_vforked, inferior_has_execd): Add
prototypes.
(target_has_forked, target_has_vforked, target_has_execd)
(target_has_syscall_event): Remove macros.
2002-11-17 03:22:59 +08:00
|
|
|
|
int
|
2008-07-10 06:23:05 +08:00
|
|
|
|
inferior_has_forked (ptid_t pid, ptid_t *child_pid)
|
* breakpoint.c (bpstat_stop_status): Call inferior_has_forked,
inferior_has_vforked, and inferior_has_execd instead of
target_has_forked, target_has_vforked, and target_has_execd.
* config/pa/nm-hppah.h (CHILD_HAS_FORKED, CHILD_HAS_VFORKED)
(CHILD_HAS_EXECD, CHILD_HAS_SYSCALL_EVENT): Don't define.
(CHILD_WAIT): Define.
(child_wait): Add prototype.
* hppah-nat.c (hpux_has_forked): Rename from child_has_forked.
Add prototype.
(hpux_has_vforked): Likewise, from child_has_vforked.
(hpux_has_execd): Likewise, from child_has_execd.
(hpux_has_syscall_event): Likewise, from child_has_syscall_event.
(not_same_real_pid, child_wait): New, copied from inftarg.c.
Call hpux_has_forked, hpux_has_vforked, hpux_has_execd,
and hpux_has_syscall_event instead of the target hooks.
* infrun.c (inferior_has_forked, inferior_has_vforked)
(inferior_has_execd): New functions.
* inftarg.c (not_same_real_pid): Remove.
(child_wait): Remove references to not_same_real_pid,
target_has_forked, target_has_vforked, target_has_execd,
and target_has_syscall_event.
(child_has_forked, child_has_vforked, child_has_execd)
(child_has_syscall_event): Remove.
(init_child_ops): Remove references to child_has_forked,
child_has_vforked, child_has_execd, and child_has_syscall_event.
* infttrace.c (hpux_has_forked): Rename from child_has_forked.
(hpux_has_vforked): Likewise, from child_has_vforked.
(hpux_has_execd): Likewise, from child_has_execd.
(hpux_has_syscall_event): Likewise, from child_has_syscall_event.
* target.c (cleanup_target): Remove references to
to_has_forked, to_has_vforked, to_has_execd, and
to_has_syscall_event.
(update_current_target): Likewise.
(setup_target_debug): Likewise.
(debug_to_has_forked): Remove.
(debug_to_has_vforked): Remove.
(debug_to_has_execd): Remove.
(debug_to_has_syscall_event): Remove.
* target.h (struct target_ops): Remove to_has_forked.
to_has_vforked, to_has_execd, and to_has_syscall_event.
(child_has_forked, child_has_vforked, child_has_execd)
(child_has_syscall_event): Remove prototypes.
(inferior_has_forked, inferior_has_vforked, inferior_has_execd): Add
prototypes.
(target_has_forked, target_has_vforked, target_has_execd)
(target_has_syscall_event): Remove macros.
2002-11-17 03:22:59 +08:00
|
|
|
|
{
|
|
|
|
|
struct target_waitstatus last;
|
|
|
|
|
ptid_t last_ptid;
|
|
|
|
|
|
|
|
|
|
get_last_target_status (&last_ptid, &last);
|
|
|
|
|
|
|
|
|
|
if (last.kind != TARGET_WAITKIND_FORKED)
|
|
|
|
|
return 0;
|
|
|
|
|
|
2008-07-10 06:23:05 +08:00
|
|
|
|
if (!ptid_equal (last_ptid, pid))
|
* breakpoint.c (bpstat_stop_status): Call inferior_has_forked,
inferior_has_vforked, and inferior_has_execd instead of
target_has_forked, target_has_vforked, and target_has_execd.
* config/pa/nm-hppah.h (CHILD_HAS_FORKED, CHILD_HAS_VFORKED)
(CHILD_HAS_EXECD, CHILD_HAS_SYSCALL_EVENT): Don't define.
(CHILD_WAIT): Define.
(child_wait): Add prototype.
* hppah-nat.c (hpux_has_forked): Rename from child_has_forked.
Add prototype.
(hpux_has_vforked): Likewise, from child_has_vforked.
(hpux_has_execd): Likewise, from child_has_execd.
(hpux_has_syscall_event): Likewise, from child_has_syscall_event.
(not_same_real_pid, child_wait): New, copied from inftarg.c.
Call hpux_has_forked, hpux_has_vforked, hpux_has_execd,
and hpux_has_syscall_event instead of the target hooks.
* infrun.c (inferior_has_forked, inferior_has_vforked)
(inferior_has_execd): New functions.
* inftarg.c (not_same_real_pid): Remove.
(child_wait): Remove references to not_same_real_pid,
target_has_forked, target_has_vforked, target_has_execd,
and target_has_syscall_event.
(child_has_forked, child_has_vforked, child_has_execd)
(child_has_syscall_event): Remove.
(init_child_ops): Remove references to child_has_forked,
child_has_vforked, child_has_execd, and child_has_syscall_event.
* infttrace.c (hpux_has_forked): Rename from child_has_forked.
(hpux_has_vforked): Likewise, from child_has_vforked.
(hpux_has_execd): Likewise, from child_has_execd.
(hpux_has_syscall_event): Likewise, from child_has_syscall_event.
* target.c (cleanup_target): Remove references to
to_has_forked, to_has_vforked, to_has_execd, and
to_has_syscall_event.
(update_current_target): Likewise.
(setup_target_debug): Likewise.
(debug_to_has_forked): Remove.
(debug_to_has_vforked): Remove.
(debug_to_has_execd): Remove.
(debug_to_has_syscall_event): Remove.
* target.h (struct target_ops): Remove to_has_forked.
to_has_vforked, to_has_execd, and to_has_syscall_event.
(child_has_forked, child_has_vforked, child_has_execd)
(child_has_syscall_event): Remove prototypes.
(inferior_has_forked, inferior_has_vforked, inferior_has_execd): Add
prototypes.
(target_has_forked, target_has_vforked, target_has_execd)
(target_has_syscall_event): Remove macros.
2002-11-17 03:22:59 +08:00
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
*child_pid = last.value.related_pid;
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
2008-07-10 06:23:05 +08:00
|
|
|
|
inferior_has_vforked (ptid_t pid, ptid_t *child_pid)
|
* breakpoint.c (bpstat_stop_status): Call inferior_has_forked,
inferior_has_vforked, and inferior_has_execd instead of
target_has_forked, target_has_vforked, and target_has_execd.
* config/pa/nm-hppah.h (CHILD_HAS_FORKED, CHILD_HAS_VFORKED)
(CHILD_HAS_EXECD, CHILD_HAS_SYSCALL_EVENT): Don't define.
(CHILD_WAIT): Define.
(child_wait): Add prototype.
* hppah-nat.c (hpux_has_forked): Rename from child_has_forked.
Add prototype.
(hpux_has_vforked): Likewise, from child_has_vforked.
(hpux_has_execd): Likewise, from child_has_execd.
(hpux_has_syscall_event): Likewise, from child_has_syscall_event.
(not_same_real_pid, child_wait): New, copied from inftarg.c.
Call hpux_has_forked, hpux_has_vforked, hpux_has_execd,
and hpux_has_syscall_event instead of the target hooks.
* infrun.c (inferior_has_forked, inferior_has_vforked)
(inferior_has_execd): New functions.
* inftarg.c (not_same_real_pid): Remove.
(child_wait): Remove references to not_same_real_pid,
target_has_forked, target_has_vforked, target_has_execd,
and target_has_syscall_event.
(child_has_forked, child_has_vforked, child_has_execd)
(child_has_syscall_event): Remove.
(init_child_ops): Remove references to child_has_forked,
child_has_vforked, child_has_execd, and child_has_syscall_event.
* infttrace.c (hpux_has_forked): Rename from child_has_forked.
(hpux_has_vforked): Likewise, from child_has_vforked.
(hpux_has_execd): Likewise, from child_has_execd.
(hpux_has_syscall_event): Likewise, from child_has_syscall_event.
* target.c (cleanup_target): Remove references to
to_has_forked, to_has_vforked, to_has_execd, and
to_has_syscall_event.
(update_current_target): Likewise.
(setup_target_debug): Likewise.
(debug_to_has_forked): Remove.
(debug_to_has_vforked): Remove.
(debug_to_has_execd): Remove.
(debug_to_has_syscall_event): Remove.
* target.h (struct target_ops): Remove to_has_forked.
to_has_vforked, to_has_execd, and to_has_syscall_event.
(child_has_forked, child_has_vforked, child_has_execd)
(child_has_syscall_event): Remove prototypes.
(inferior_has_forked, inferior_has_vforked, inferior_has_execd): Add
prototypes.
(target_has_forked, target_has_vforked, target_has_execd)
(target_has_syscall_event): Remove macros.
2002-11-17 03:22:59 +08:00
|
|
|
|
{
|
|
|
|
|
struct target_waitstatus last;
|
|
|
|
|
ptid_t last_ptid;
|
|
|
|
|
|
|
|
|
|
get_last_target_status (&last_ptid, &last);
|
|
|
|
|
|
|
|
|
|
if (last.kind != TARGET_WAITKIND_VFORKED)
|
|
|
|
|
return 0;
|
|
|
|
|
|
2008-07-10 06:23:05 +08:00
|
|
|
|
if (!ptid_equal (last_ptid, pid))
|
* breakpoint.c (bpstat_stop_status): Call inferior_has_forked,
inferior_has_vforked, and inferior_has_execd instead of
target_has_forked, target_has_vforked, and target_has_execd.
* config/pa/nm-hppah.h (CHILD_HAS_FORKED, CHILD_HAS_VFORKED)
(CHILD_HAS_EXECD, CHILD_HAS_SYSCALL_EVENT): Don't define.
(CHILD_WAIT): Define.
(child_wait): Add prototype.
* hppah-nat.c (hpux_has_forked): Rename from child_has_forked.
Add prototype.
(hpux_has_vforked): Likewise, from child_has_vforked.
(hpux_has_execd): Likewise, from child_has_execd.
(hpux_has_syscall_event): Likewise, from child_has_syscall_event.
(not_same_real_pid, child_wait): New, copied from inftarg.c.
Call hpux_has_forked, hpux_has_vforked, hpux_has_execd,
and hpux_has_syscall_event instead of the target hooks.
* infrun.c (inferior_has_forked, inferior_has_vforked)
(inferior_has_execd): New functions.
* inftarg.c (not_same_real_pid): Remove.
(child_wait): Remove references to not_same_real_pid,
target_has_forked, target_has_vforked, target_has_execd,
and target_has_syscall_event.
(child_has_forked, child_has_vforked, child_has_execd)
(child_has_syscall_event): Remove.
(init_child_ops): Remove references to child_has_forked,
child_has_vforked, child_has_execd, and child_has_syscall_event.
* infttrace.c (hpux_has_forked): Rename from child_has_forked.
(hpux_has_vforked): Likewise, from child_has_vforked.
(hpux_has_execd): Likewise, from child_has_execd.
(hpux_has_syscall_event): Likewise, from child_has_syscall_event.
* target.c (cleanup_target): Remove references to
to_has_forked, to_has_vforked, to_has_execd, and
to_has_syscall_event.
(update_current_target): Likewise.
(setup_target_debug): Likewise.
(debug_to_has_forked): Remove.
(debug_to_has_vforked): Remove.
(debug_to_has_execd): Remove.
(debug_to_has_syscall_event): Remove.
* target.h (struct target_ops): Remove to_has_forked.
to_has_vforked, to_has_execd, and to_has_syscall_event.
(child_has_forked, child_has_vforked, child_has_execd)
(child_has_syscall_event): Remove prototypes.
(inferior_has_forked, inferior_has_vforked, inferior_has_execd): Add
prototypes.
(target_has_forked, target_has_vforked, target_has_execd)
(target_has_syscall_event): Remove macros.
2002-11-17 03:22:59 +08:00
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
*child_pid = last.value.related_pid;
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
2008-07-10 06:23:05 +08:00
|
|
|
|
inferior_has_execd (ptid_t pid, char **execd_pathname)
|
* breakpoint.c (bpstat_stop_status): Call inferior_has_forked,
inferior_has_vforked, and inferior_has_execd instead of
target_has_forked, target_has_vforked, and target_has_execd.
* config/pa/nm-hppah.h (CHILD_HAS_FORKED, CHILD_HAS_VFORKED)
(CHILD_HAS_EXECD, CHILD_HAS_SYSCALL_EVENT): Don't define.
(CHILD_WAIT): Define.
(child_wait): Add prototype.
* hppah-nat.c (hpux_has_forked): Rename from child_has_forked.
Add prototype.
(hpux_has_vforked): Likewise, from child_has_vforked.
(hpux_has_execd): Likewise, from child_has_execd.
(hpux_has_syscall_event): Likewise, from child_has_syscall_event.
(not_same_real_pid, child_wait): New, copied from inftarg.c.
Call hpux_has_forked, hpux_has_vforked, hpux_has_execd,
and hpux_has_syscall_event instead of the target hooks.
* infrun.c (inferior_has_forked, inferior_has_vforked)
(inferior_has_execd): New functions.
* inftarg.c (not_same_real_pid): Remove.
(child_wait): Remove references to not_same_real_pid,
target_has_forked, target_has_vforked, target_has_execd,
and target_has_syscall_event.
(child_has_forked, child_has_vforked, child_has_execd)
(child_has_syscall_event): Remove.
(init_child_ops): Remove references to child_has_forked,
child_has_vforked, child_has_execd, and child_has_syscall_event.
* infttrace.c (hpux_has_forked): Rename from child_has_forked.
(hpux_has_vforked): Likewise, from child_has_vforked.
(hpux_has_execd): Likewise, from child_has_execd.
(hpux_has_syscall_event): Likewise, from child_has_syscall_event.
* target.c (cleanup_target): Remove references to
to_has_forked, to_has_vforked, to_has_execd, and
to_has_syscall_event.
(update_current_target): Likewise.
(setup_target_debug): Likewise.
(debug_to_has_forked): Remove.
(debug_to_has_vforked): Remove.
(debug_to_has_execd): Remove.
(debug_to_has_syscall_event): Remove.
* target.h (struct target_ops): Remove to_has_forked.
to_has_vforked, to_has_execd, and to_has_syscall_event.
(child_has_forked, child_has_vforked, child_has_execd)
(child_has_syscall_event): Remove prototypes.
(inferior_has_forked, inferior_has_vforked, inferior_has_execd): Add
prototypes.
(target_has_forked, target_has_vforked, target_has_execd)
(target_has_syscall_event): Remove macros.
2002-11-17 03:22:59 +08:00
|
|
|
|
{
|
|
|
|
|
struct target_waitstatus last;
|
|
|
|
|
ptid_t last_ptid;
|
|
|
|
|
|
|
|
|
|
get_last_target_status (&last_ptid, &last);
|
|
|
|
|
|
|
|
|
|
if (last.kind != TARGET_WAITKIND_EXECD)
|
|
|
|
|
return 0;
|
|
|
|
|
|
2008-07-10 06:23:05 +08:00
|
|
|
|
if (!ptid_equal (last_ptid, pid))
|
* breakpoint.c (bpstat_stop_status): Call inferior_has_forked,
inferior_has_vforked, and inferior_has_execd instead of
target_has_forked, target_has_vforked, and target_has_execd.
* config/pa/nm-hppah.h (CHILD_HAS_FORKED, CHILD_HAS_VFORKED)
(CHILD_HAS_EXECD, CHILD_HAS_SYSCALL_EVENT): Don't define.
(CHILD_WAIT): Define.
(child_wait): Add prototype.
* hppah-nat.c (hpux_has_forked): Rename from child_has_forked.
Add prototype.
(hpux_has_vforked): Likewise, from child_has_vforked.
(hpux_has_execd): Likewise, from child_has_execd.
(hpux_has_syscall_event): Likewise, from child_has_syscall_event.
(not_same_real_pid, child_wait): New, copied from inftarg.c.
Call hpux_has_forked, hpux_has_vforked, hpux_has_execd,
and hpux_has_syscall_event instead of the target hooks.
* infrun.c (inferior_has_forked, inferior_has_vforked)
(inferior_has_execd): New functions.
* inftarg.c (not_same_real_pid): Remove.
(child_wait): Remove references to not_same_real_pid,
target_has_forked, target_has_vforked, target_has_execd,
and target_has_syscall_event.
(child_has_forked, child_has_vforked, child_has_execd)
(child_has_syscall_event): Remove.
(init_child_ops): Remove references to child_has_forked,
child_has_vforked, child_has_execd, and child_has_syscall_event.
* infttrace.c (hpux_has_forked): Rename from child_has_forked.
(hpux_has_vforked): Likewise, from child_has_vforked.
(hpux_has_execd): Likewise, from child_has_execd.
(hpux_has_syscall_event): Likewise, from child_has_syscall_event.
* target.c (cleanup_target): Remove references to
to_has_forked, to_has_vforked, to_has_execd, and
to_has_syscall_event.
(update_current_target): Likewise.
(setup_target_debug): Likewise.
(debug_to_has_forked): Remove.
(debug_to_has_vforked): Remove.
(debug_to_has_execd): Remove.
(debug_to_has_syscall_event): Remove.
* target.h (struct target_ops): Remove to_has_forked.
to_has_vforked, to_has_execd, and to_has_syscall_event.
(child_has_forked, child_has_vforked, child_has_execd)
(child_has_syscall_event): Remove prototypes.
(inferior_has_forked, inferior_has_vforked, inferior_has_execd): Add
prototypes.
(target_has_forked, target_has_vforked, target_has_execd)
(target_has_syscall_event): Remove macros.
2002-11-17 03:22:59 +08:00
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
*execd_pathname = xstrdup (last.value.execd_pathname);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
2001-05-15 08:03:38 +08:00
|
|
|
|
/* Oft used ptids */
|
|
|
|
|
ptid_t null_ptid;
|
|
|
|
|
ptid_t minus_one_ptid;
|
|
|
|
|
|
|
|
|
|
/* Create a ptid given the necessary PID, LWP, and TID components. */
|
2002-07-19 01:53:50 +08:00
|
|
|
|
|
2001-05-15 08:03:38 +08:00
|
|
|
|
ptid_t
|
|
|
|
|
ptid_build (int pid, long lwp, long tid)
|
|
|
|
|
{
|
|
|
|
|
ptid_t ptid;
|
|
|
|
|
|
|
|
|
|
ptid.pid = pid;
|
|
|
|
|
ptid.lwp = lwp;
|
|
|
|
|
ptid.tid = tid;
|
|
|
|
|
return ptid;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Create a ptid from just a pid. */
|
|
|
|
|
|
|
|
|
|
ptid_t
|
|
|
|
|
pid_to_ptid (int pid)
|
|
|
|
|
{
|
|
|
|
|
return ptid_build (pid, 0, 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Fetch the pid (process id) component from a ptid. */
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
ptid_get_pid (ptid_t ptid)
|
|
|
|
|
{
|
|
|
|
|
return ptid.pid;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Fetch the lwp (lightweight process) component from a ptid. */
|
|
|
|
|
|
|
|
|
|
long
|
|
|
|
|
ptid_get_lwp (ptid_t ptid)
|
|
|
|
|
{
|
|
|
|
|
return ptid.lwp;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Fetch the tid (thread id) component from a ptid. */
|
|
|
|
|
|
|
|
|
|
long
|
|
|
|
|
ptid_get_tid (ptid_t ptid)
|
|
|
|
|
{
|
|
|
|
|
return ptid.tid;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* ptid_equal() is used to test equality of two ptids. */
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
ptid_equal (ptid_t ptid1, ptid_t ptid2)
|
|
|
|
|
{
|
|
|
|
|
return (ptid1.pid == ptid2.pid && ptid1.lwp == ptid2.lwp
|
2002-07-19 01:53:50 +08:00
|
|
|
|
&& ptid1.tid == ptid2.tid);
|
2001-05-15 08:03:38 +08:00
|
|
|
|
}
|
|
|
|
|
|
2008-10-24 07:11:21 +08:00
|
|
|
|
/* Returns true if PTID represents a process. */
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
ptid_is_pid (ptid_t ptid)
|
|
|
|
|
{
|
|
|
|
|
if (ptid_equal (minus_one_ptid, ptid))
|
|
|
|
|
return 0;
|
|
|
|
|
if (ptid_equal (null_ptid, ptid))
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
return (ptid_get_lwp (ptid) == 0 && ptid_get_tid (ptid) == 0);
|
|
|
|
|
}
|
|
|
|
|
|
2001-05-15 08:03:38 +08:00
|
|
|
|
/* restore_inferior_ptid() will be used by the cleanup machinery
|
|
|
|
|
to restore the inferior_ptid value saved in a call to
|
|
|
|
|
save_inferior_ptid(). */
|
2001-05-07 06:22:03 +08:00
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
restore_inferior_ptid (void *arg)
|
|
|
|
|
{
|
|
|
|
|
ptid_t *saved_ptid_ptr = arg;
|
|
|
|
|
inferior_ptid = *saved_ptid_ptr;
|
|
|
|
|
xfree (arg);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Save the value of inferior_ptid so that it may be restored by a
|
|
|
|
|
later call to do_cleanups(). Returns the struct cleanup pointer
|
|
|
|
|
needed for later doing the cleanup. */
|
|
|
|
|
|
|
|
|
|
struct cleanup *
|
|
|
|
|
save_inferior_ptid (void)
|
|
|
|
|
{
|
|
|
|
|
ptid_t *saved_ptid_ptr;
|
|
|
|
|
|
|
|
|
|
saved_ptid_ptr = xmalloc (sizeof (ptid_t));
|
|
|
|
|
*saved_ptid_ptr = inferior_ptid;
|
|
|
|
|
return make_cleanup (restore_inferior_ptid, saved_ptid_ptr);
|
|
|
|
|
}
|
1999-07-08 04:19:36 +08:00
|
|
|
|
|
2002-07-19 01:53:50 +08:00
|
|
|
|
|
2008-10-18 03:43:47 +08:00
|
|
|
|
/* User interface for reverse debugging:
|
|
|
|
|
Set exec-direction / show exec-direction commands
|
|
|
|
|
(returns error unless target implements to_set_exec_direction method). */
|
|
|
|
|
|
|
|
|
|
enum exec_direction_kind execution_direction = EXEC_FORWARD;
|
|
|
|
|
static const char exec_forward[] = "forward";
|
|
|
|
|
static const char exec_reverse[] = "reverse";
|
|
|
|
|
static const char *exec_direction = exec_forward;
|
|
|
|
|
static const char *exec_direction_names[] = {
|
|
|
|
|
exec_forward,
|
|
|
|
|
exec_reverse,
|
|
|
|
|
NULL
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
set_exec_direction_func (char *args, int from_tty,
|
|
|
|
|
struct cmd_list_element *cmd)
|
|
|
|
|
{
|
|
|
|
|
if (target_can_execute_reverse)
|
|
|
|
|
{
|
|
|
|
|
if (!strcmp (exec_direction, exec_forward))
|
|
|
|
|
execution_direction = EXEC_FORWARD;
|
|
|
|
|
else if (!strcmp (exec_direction, exec_reverse))
|
|
|
|
|
execution_direction = EXEC_REVERSE;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
show_exec_direction_func (struct ui_file *out, int from_tty,
|
|
|
|
|
struct cmd_list_element *cmd, const char *value)
|
|
|
|
|
{
|
|
|
|
|
switch (execution_direction) {
|
|
|
|
|
case EXEC_FORWARD:
|
|
|
|
|
fprintf_filtered (out, _("Forward.\n"));
|
|
|
|
|
break;
|
|
|
|
|
case EXEC_REVERSE:
|
|
|
|
|
fprintf_filtered (out, _("Reverse.\n"));
|
|
|
|
|
break;
|
|
|
|
|
case EXEC_ERROR:
|
|
|
|
|
default:
|
|
|
|
|
fprintf_filtered (out,
|
|
|
|
|
_("Forward (target `%s' does not support exec-direction).\n"),
|
|
|
|
|
target_shortname);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* User interface for non-stop mode. */
|
|
|
|
|
|
2008-07-10 06:27:13 +08:00
|
|
|
|
int non_stop = 0;
|
|
|
|
|
static int non_stop_1 = 0;
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
set_non_stop (char *args, int from_tty,
|
|
|
|
|
struct cmd_list_element *c)
|
|
|
|
|
{
|
|
|
|
|
if (target_has_execution)
|
|
|
|
|
{
|
|
|
|
|
non_stop_1 = non_stop;
|
|
|
|
|
error (_("Cannot change this setting while the inferior is running."));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
non_stop = non_stop_1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
show_non_stop (struct ui_file *file, int from_tty,
|
|
|
|
|
struct cmd_list_element *c, const char *value)
|
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (file,
|
|
|
|
|
_("Controlling the inferior in non-stop mode is %s.\n"),
|
|
|
|
|
value);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
void
|
1999-08-10 05:36:23 +08:00
|
|
|
|
_initialize_infrun (void)
|
1999-04-16 09:35:26 +08:00
|
|
|
|
{
|
2003-09-14 Andrew Cagney <cagney@redhat.com>
* alpha-nat.c: Remove some occurances of "register".
* alpha-tdep.c, arm-tdep.c, blockframe.c, breakpoint.c: Ditto.
* buildsym.c, c-typeprint.c, c-valprint.c, coffread.c: Ditto.
* corefile.c, cp-support.c, cp-valprint.c, cris-tdep.c: Ditto.
* dbxread.c, dcache.c, dwarf2read.c, elfread.c: Ditto.
* environ.c, eval.c, event-top.c, f-typeprint.c: Ditto.
* f-valprint.c, findvar.c, frame.c, gdbtypes.c: Ditto.
* h8300-tdep.c, hppa-tdep.c, hppab-nat.c, hppah-nat.c: Ditto.
* hppam3-nat.c, hpread.c, ia64-aix-nat.c, ia64-linux-nat.c: Ditto.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Ditto.
* infttrace.c, irix5-nat.c, jv-typeprint.c: Ditto.
* jv-valprint.c, m68k-tdep.c, m68klinux-nat.c, main.c: Ditto.
* mdebugread.c, minsyms.c, mips-linux-tdep.c: Ditto.
* mips-nat.c, mips-tdep.c, mipsread.c, mipsv4-nat.c: Ditto.
* ns32k-tdep.c, objfiles.c, p-typeprint.c: Ditto.
* p-valprint.c, ppc-linux-nat.c, printcmd.c: Ditto.
* remote-mips.c, remote-vx.c, rs6000-nat.c: Ditto.
* rs6000-tdep.c, scm-exp.c, sh-tdep.c, sh64-tdep.c: Ditto.
* solib.c, somread.c, source.c, sparc-tdep.c: Ditto.
* stabsread.c, stack.c, standalone.c, symfile.c: Ditto.
* symmisc.c, symtab.c, top.c, tracepoint.c: Ditto.
* typeprint.c, utils.c, valarith.c, valops.c: Ditto.
* values.c, vax-tdep.c, xcoffread.c: Ditto.
2003-09-15 00:32:14 +08:00
|
|
|
|
int i;
|
|
|
|
|
int numsigs;
|
1999-04-16 09:35:26 +08:00
|
|
|
|
struct cmd_list_element *c;
|
|
|
|
|
|
2005-02-15 Andrew Cagney <cagney@gnu.org>
Mark up add_com, add_info and add_prefix_cmd.
* breakpoint.c, cp-support.c, dcache.c, dwarf2read.c: Update.
* exec.c, f-valprint.c, frame.c, gcore.c, gnu-nat.c: Update.
* go32-nat.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* kod.c, language.c, linux-nat.c, m32r-rom.c, macrocmd.c: Update.
* maint.c, memattr.c, mips-tdep.c, nto-procfs.c, objc-lang.c: Update.
* ocd.c, pa64solib.c, printcmd.c, procfs.c, regcache.c: Update.
* remote-e7000.c, remote-m32r-sdi.c, remote-mips.c: Update.
* remote-sds.c, remote-sim.c, remote-st.c, remote-utils.c: Update.
* remote.c, rs6000-tdep.c, ser-go32.c, serial.c: Update.
* sh-tdep.c, solib.c, somsolib.c, source.c, stack.c: Update.
* symfile.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, typeprint.c, utils.c, valprint.c: Update.
* win32-nat.c, xcoffsolib.c, cli/cli-cmds.c, cli/cli-dump.c: Update.
* cli/cli-logging.c, tui/tui-layout.c, tui/tui-regs.c: Update.
* tui/tui-stack.c, tui/tui-win.c: Update.
2005-02-15 23:49:28 +08:00
|
|
|
|
add_info ("signals", signals_info, _("\
|
|
|
|
|
What debugger does when program gets various signals.\n\
|
|
|
|
|
Specify a signal as argument to print info on that signal only."));
|
1999-04-16 09:35:26 +08:00
|
|
|
|
add_info_alias ("handle", "signals", 0);
|
|
|
|
|
|
2005-02-15 Andrew Cagney <cagney@gnu.org>
Mark up add_com, add_info and add_prefix_cmd.
* breakpoint.c, cp-support.c, dcache.c, dwarf2read.c: Update.
* exec.c, f-valprint.c, frame.c, gcore.c, gnu-nat.c: Update.
* go32-nat.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* kod.c, language.c, linux-nat.c, m32r-rom.c, macrocmd.c: Update.
* maint.c, memattr.c, mips-tdep.c, nto-procfs.c, objc-lang.c: Update.
* ocd.c, pa64solib.c, printcmd.c, procfs.c, regcache.c: Update.
* remote-e7000.c, remote-m32r-sdi.c, remote-mips.c: Update.
* remote-sds.c, remote-sim.c, remote-st.c, remote-utils.c: Update.
* remote.c, rs6000-tdep.c, ser-go32.c, serial.c: Update.
* sh-tdep.c, solib.c, somsolib.c, source.c, stack.c: Update.
* symfile.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, typeprint.c, utils.c, valprint.c: Update.
* win32-nat.c, xcoffsolib.c, cli/cli-cmds.c, cli/cli-dump.c: Update.
* cli/cli-logging.c, tui/tui-layout.c, tui/tui-regs.c: Update.
* tui/tui-stack.c, tui/tui-win.c: Update.
2005-02-15 23:49:28 +08:00
|
|
|
|
add_com ("handle", class_run, handle_command, _("\
|
|
|
|
|
Specify how to handle a signal.\n\
|
1999-04-16 09:35:26 +08:00
|
|
|
|
Args are signals and actions to apply to those signals.\n\
|
|
|
|
|
Symbolic signals (e.g. SIGSEGV) are recommended but numeric signals\n\
|
|
|
|
|
from 1-15 are allowed for compatibility with old versions of GDB.\n\
|
|
|
|
|
Numeric ranges may be specified with the form LOW-HIGH (e.g. 1-5).\n\
|
|
|
|
|
The special arg \"all\" is recognized to mean all signals except those\n\
|
2005-02-15 Andrew Cagney <cagney@gnu.org>
Mark up add_com, add_info and add_prefix_cmd.
* breakpoint.c, cp-support.c, dcache.c, dwarf2read.c: Update.
* exec.c, f-valprint.c, frame.c, gcore.c, gnu-nat.c: Update.
* go32-nat.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* kod.c, language.c, linux-nat.c, m32r-rom.c, macrocmd.c: Update.
* maint.c, memattr.c, mips-tdep.c, nto-procfs.c, objc-lang.c: Update.
* ocd.c, pa64solib.c, printcmd.c, procfs.c, regcache.c: Update.
* remote-e7000.c, remote-m32r-sdi.c, remote-mips.c: Update.
* remote-sds.c, remote-sim.c, remote-st.c, remote-utils.c: Update.
* remote.c, rs6000-tdep.c, ser-go32.c, serial.c: Update.
* sh-tdep.c, solib.c, somsolib.c, source.c, stack.c: Update.
* symfile.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, typeprint.c, utils.c, valprint.c: Update.
* win32-nat.c, xcoffsolib.c, cli/cli-cmds.c, cli/cli-dump.c: Update.
* cli/cli-logging.c, tui/tui-layout.c, tui/tui-regs.c: Update.
* tui/tui-stack.c, tui/tui-win.c: Update.
2005-02-15 23:49:28 +08:00
|
|
|
|
used by the debugger, typically SIGTRAP and SIGINT.\n\
|
|
|
|
|
Recognized actions include \"stop\", \"nostop\", \"print\", \"noprint\",\n\
|
1999-04-16 09:35:26 +08:00
|
|
|
|
\"pass\", \"nopass\", \"ignore\", or \"noignore\".\n\
|
|
|
|
|
Stop means reenter debugger if this signal happens (implies print).\n\
|
|
|
|
|
Print means print a message if this signal happens.\n\
|
|
|
|
|
Pass means let program see this signal; otherwise program doesn't know.\n\
|
|
|
|
|
Ignore is a synonym for nopass and noignore is a synonym for pass.\n\
|
2005-02-15 Andrew Cagney <cagney@gnu.org>
Mark up add_com, add_info and add_prefix_cmd.
* breakpoint.c, cp-support.c, dcache.c, dwarf2read.c: Update.
* exec.c, f-valprint.c, frame.c, gcore.c, gnu-nat.c: Update.
* go32-nat.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* kod.c, language.c, linux-nat.c, m32r-rom.c, macrocmd.c: Update.
* maint.c, memattr.c, mips-tdep.c, nto-procfs.c, objc-lang.c: Update.
* ocd.c, pa64solib.c, printcmd.c, procfs.c, regcache.c: Update.
* remote-e7000.c, remote-m32r-sdi.c, remote-mips.c: Update.
* remote-sds.c, remote-sim.c, remote-st.c, remote-utils.c: Update.
* remote.c, rs6000-tdep.c, ser-go32.c, serial.c: Update.
* sh-tdep.c, solib.c, somsolib.c, source.c, stack.c: Update.
* symfile.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, typeprint.c, utils.c, valprint.c: Update.
* win32-nat.c, xcoffsolib.c, cli/cli-cmds.c, cli/cli-dump.c: Update.
* cli/cli-logging.c, tui/tui-layout.c, tui/tui-regs.c: Update.
* tui/tui-stack.c, tui/tui-win.c: Update.
2005-02-15 23:49:28 +08:00
|
|
|
|
Pass and Stop may be combined."));
|
1999-04-16 09:35:26 +08:00
|
|
|
|
if (xdb_commands)
|
|
|
|
|
{
|
2005-02-15 Andrew Cagney <cagney@gnu.org>
Mark up add_com, add_info and add_prefix_cmd.
* breakpoint.c, cp-support.c, dcache.c, dwarf2read.c: Update.
* exec.c, f-valprint.c, frame.c, gcore.c, gnu-nat.c: Update.
* go32-nat.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* kod.c, language.c, linux-nat.c, m32r-rom.c, macrocmd.c: Update.
* maint.c, memattr.c, mips-tdep.c, nto-procfs.c, objc-lang.c: Update.
* ocd.c, pa64solib.c, printcmd.c, procfs.c, regcache.c: Update.
* remote-e7000.c, remote-m32r-sdi.c, remote-mips.c: Update.
* remote-sds.c, remote-sim.c, remote-st.c, remote-utils.c: Update.
* remote.c, rs6000-tdep.c, ser-go32.c, serial.c: Update.
* sh-tdep.c, solib.c, somsolib.c, source.c, stack.c: Update.
* symfile.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, typeprint.c, utils.c, valprint.c: Update.
* win32-nat.c, xcoffsolib.c, cli/cli-cmds.c, cli/cli-dump.c: Update.
* cli/cli-logging.c, tui/tui-layout.c, tui/tui-regs.c: Update.
* tui/tui-stack.c, tui/tui-win.c: Update.
2005-02-15 23:49:28 +08:00
|
|
|
|
add_com ("lz", class_info, signals_info, _("\
|
|
|
|
|
What debugger does when program gets various signals.\n\
|
|
|
|
|
Specify a signal as argument to print info on that signal only."));
|
|
|
|
|
add_com ("z", class_run, xdb_handle_command, _("\
|
|
|
|
|
Specify how to handle a signal.\n\
|
1999-04-16 09:35:26 +08:00
|
|
|
|
Args are signals and actions to apply to those signals.\n\
|
|
|
|
|
Symbolic signals (e.g. SIGSEGV) are recommended but numeric signals\n\
|
|
|
|
|
from 1-15 are allowed for compatibility with old versions of GDB.\n\
|
|
|
|
|
Numeric ranges may be specified with the form LOW-HIGH (e.g. 1-5).\n\
|
|
|
|
|
The special arg \"all\" is recognized to mean all signals except those\n\
|
2005-02-15 Andrew Cagney <cagney@gnu.org>
Mark up add_com, add_info and add_prefix_cmd.
* breakpoint.c, cp-support.c, dcache.c, dwarf2read.c: Update.
* exec.c, f-valprint.c, frame.c, gcore.c, gnu-nat.c: Update.
* go32-nat.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* kod.c, language.c, linux-nat.c, m32r-rom.c, macrocmd.c: Update.
* maint.c, memattr.c, mips-tdep.c, nto-procfs.c, objc-lang.c: Update.
* ocd.c, pa64solib.c, printcmd.c, procfs.c, regcache.c: Update.
* remote-e7000.c, remote-m32r-sdi.c, remote-mips.c: Update.
* remote-sds.c, remote-sim.c, remote-st.c, remote-utils.c: Update.
* remote.c, rs6000-tdep.c, ser-go32.c, serial.c: Update.
* sh-tdep.c, solib.c, somsolib.c, source.c, stack.c: Update.
* symfile.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, typeprint.c, utils.c, valprint.c: Update.
* win32-nat.c, xcoffsolib.c, cli/cli-cmds.c, cli/cli-dump.c: Update.
* cli/cli-logging.c, tui/tui-layout.c, tui/tui-regs.c: Update.
* tui/tui-stack.c, tui/tui-win.c: Update.
2005-02-15 23:49:28 +08:00
|
|
|
|
used by the debugger, typically SIGTRAP and SIGINT.\n\
|
|
|
|
|
Recognized actions include \"s\" (toggles between stop and nostop), \n\
|
1999-04-16 09:35:26 +08:00
|
|
|
|
\"r\" (toggles between print and noprint), \"i\" (toggles between pass and \
|
|
|
|
|
nopass), \"Q\" (noprint)\n\
|
|
|
|
|
Stop means reenter debugger if this signal happens (implies print).\n\
|
|
|
|
|
Print means print a message if this signal happens.\n\
|
|
|
|
|
Pass means let program see this signal; otherwise program doesn't know.\n\
|
|
|
|
|
Ignore is a synonym for nopass and noignore is a synonym for pass.\n\
|
2005-02-15 Andrew Cagney <cagney@gnu.org>
Mark up add_com, add_info and add_prefix_cmd.
* breakpoint.c, cp-support.c, dcache.c, dwarf2read.c: Update.
* exec.c, f-valprint.c, frame.c, gcore.c, gnu-nat.c: Update.
* go32-nat.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* kod.c, language.c, linux-nat.c, m32r-rom.c, macrocmd.c: Update.
* maint.c, memattr.c, mips-tdep.c, nto-procfs.c, objc-lang.c: Update.
* ocd.c, pa64solib.c, printcmd.c, procfs.c, regcache.c: Update.
* remote-e7000.c, remote-m32r-sdi.c, remote-mips.c: Update.
* remote-sds.c, remote-sim.c, remote-st.c, remote-utils.c: Update.
* remote.c, rs6000-tdep.c, ser-go32.c, serial.c: Update.
* sh-tdep.c, solib.c, somsolib.c, source.c, stack.c: Update.
* symfile.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, typeprint.c, utils.c, valprint.c: Update.
* win32-nat.c, xcoffsolib.c, cli/cli-cmds.c, cli/cli-dump.c: Update.
* cli/cli-logging.c, tui/tui-layout.c, tui/tui-regs.c: Update.
* tui/tui-stack.c, tui/tui-win.c: Update.
2005-02-15 23:49:28 +08:00
|
|
|
|
Pass and Stop may be combined."));
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!dbx_commands)
|
2005-02-14 Andrew Cagney <cagney@gnu.org>
Mark up add_cmd.
* arch-utils.c, avr-tdep.c, breakpoint.c, corefile.c: Update.
* cp-abi.c, cp-namespace.c, cp-support.c, dummy-frame.c: Update.
* exec.c, gnu-nat.c, go32-nat.c, hppa-tdep.c, infcmd.c: Update.
* infrun.c, interps.c, macrocmd.c, maint.c, memattr.c: Update.
* mips-tdep.c, ocd.c, osabi.c, printcmd.c, regcache.c: Update.
* reggroups.c, remote-fileio.c, remote-rdi.c, remote.c: Update.
* sol-thread.c, source.c, stack.c, symfile-mem.c: Update.
* symfile.c, thread.c, tracepoint.c, valprint.c, value.c: Update.
* win32-nat.c, cli/cli-cmds.c, cli/cli-dump.c: Update.
* cli/cli-logging.c, tui/tui-regs.c: Update.
2005-02-15 02:10:11 +08:00
|
|
|
|
stop_command = add_cmd ("stop", class_obscure,
|
|
|
|
|
not_just_help_class_command, _("\
|
|
|
|
|
There is no `stop' command, but you can set a hook on `stop'.\n\
|
1999-04-16 09:35:26 +08:00
|
|
|
|
This allows you to set a list of commands to be run each time execution\n\
|
2005-02-14 Andrew Cagney <cagney@gnu.org>
Mark up add_cmd.
* arch-utils.c, avr-tdep.c, breakpoint.c, corefile.c: Update.
* cp-abi.c, cp-namespace.c, cp-support.c, dummy-frame.c: Update.
* exec.c, gnu-nat.c, go32-nat.c, hppa-tdep.c, infcmd.c: Update.
* infrun.c, interps.c, macrocmd.c, maint.c, memattr.c: Update.
* mips-tdep.c, ocd.c, osabi.c, printcmd.c, regcache.c: Update.
* reggroups.c, remote-fileio.c, remote-rdi.c, remote.c: Update.
* sol-thread.c, source.c, stack.c, symfile-mem.c: Update.
* symfile.c, thread.c, tracepoint.c, valprint.c, value.c: Update.
* win32-nat.c, cli/cli-cmds.c, cli/cli-dump.c: Update.
* cli/cli-logging.c, tui/tui-regs.c: Update.
2005-02-15 02:10:11 +08:00
|
|
|
|
of the program stops."), &cmdlist);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2005-02-18 Andrew Cagney <cagney@gnu.org>
Use add_setshow_zinteger_cmd through out. Re-sync gdbarch.sh
and gdbarch.c.
* breakpoint.c, frame.c, gdb-events.sh, gdbarch.sh: Update.
* gdbtypes.c, infrun.c, linux-nat.c, maint.c, monitor.c: Update.
* pa64solib.c, parse.c, remote-mips.c, ser-go32.c: Update.
* serial.c, solib-frv.c, somsolib.c, target.c, top.c: Update.
* varobj.c, cli/cli-cmds.c: Update.
* gdbarch.c, gdb-events.c: Regenerate.
2005-02-19 02:58:56 +08:00
|
|
|
|
add_setshow_zinteger_cmd ("infrun", class_maintenance, &debug_infrun, _("\
|
|
|
|
|
Set inferior debugging."), _("\
|
|
|
|
|
Show inferior debugging."), _("\
|
|
|
|
|
When non-zero, inferior specific debugging is enabled."),
|
|
|
|
|
NULL,
|
2005-02-24 Andrew Cagney <cagney@gnu.org>
Add show_VARIABLE functions, update add_setshow call.
* varobj.c (_initialize_varobj, show_varobjdebug): Add and update.
* valprint.c (_initialize_valprint, show_print_max)
(show_stop_print_at_null, show_repeat_count_threshold)
(show_prettyprint_structs, show_unionprint)
(show_prettyprint_arrays, show_addressprint, show_input_radix)
(show_output_radix): Ditto.
* valops.c (_initialize_valops, show_overload_resolution): Ditto.
* utils.c (initialize_utils, show_chars_per_line)
(show_lines_per_page, show_demangle, show_pagination_enabled)
(show_sevenbit_strings, show_asm_demangle): Ditto
* tui/tui-win.c (_initialize_tui_win, show_tui_border_kind)
(show_tui_border_mode, show_tui_active_border_mode): Ditto.
* top.c (init_main, show_new_async_prompt)
(show_async_command_editing_p, show_write_history_p)
(show_history_size, show_history_filename, show_caution)
(show_annotation_level, init_main): Ditto.
* target.c (initialize_targets, show_targetdebug)
(show_trust_readonly): Ditto.
* symfile.c (_initialize_symfile, show_symbol_reloading)
(show_ext_args, show_download_write_size)
(show_debug_file_directory): Ditto.
* source.c (_initialize_source, show_lines_to_list): Ditto.
* solib.c (_initialize_solib, show_auto_solib_add)
(show_solib_search_path): Ditto.
* p-valprint.c (_initialize_pascal_valprint)
(show_pascal_static_field_print): Ditto.
* printcmd.c (_initialize_printcmd, show_max_symbolic_offset)
(show_print_symbol_filename): Add and update.
* parse.c (_initialize_parse, show_expressiondebug): Dito.
* observer.c (_initialize_observer, show_observer_debug): Dito.
* maint.c (_initialize_maint_cmds, show_watchdog)
(show_maintenance_profile_p): Dito.
* linux-nat.c (_initialize_linux_nat, show_debug_linux_nat): Dito.
* infrun.c (_initialize_infrun, show_debug_infrun)
(show_stop_on_solib_events, show_follow_fork_mode_string)
(show_scheduler_mode, show_step_stop_if_no_debug): Ditto.
* infcall.c (_initialize_infcall, show_coerce_float_to_double_p)
(show_unwind_on_signal_p): Ditto.
* gdbtypes.c (build_gdbtypes, show_opaque_type_resolution)
(_initialize_gdbtypes, show_overload_debug): Ditto.
* gdb-events.c, gdb-events.sh (_initialize_gdb_events)
(show_gdb_events_debug): Ditto.
* gdbarch.c, gdbarch.sh (show_gdbarch_debug)
(_initialize_gdbarch): Ditto.
* frame.c (_initialize_frame, show_backtrace_past_main)
(show_backtrace_past_entry, show_backtrace_limit)
(show_frame_debug): Ditto.
* exec.c (_initialize_exec, show_write_files): Ditto.
* dwarf2read.c (_initialize_dwarf2_read)
(show_dwarf2_max_cache_age): Ditto.
* demangle.c (_initialize_demangler)
(show_demangling_style_names): Ditto.
* dcache.c (_initialize_dcache, show_dcache_enabled_p): Ditto.
* cp-valprint.c (show_static_field_print)
(_initialize_cp_valprint, show_vtblprint, show_objectprint): Ditto.
* corefile.c (_initialize_core, show_gnutarget_string): Ditto.
* cli/cli-logging.c (_initialize_cli_logging)
(show_logging_overwrite, show_logging_redirect)
(show_logging_filename): Ditto.
* cli/cli-cmds.c (show_info_verbose, show_history_expansion_p)
(init_cli_cmds, show_baud_rate, show_remote_debug)
(show_remote_timeout, show_max_user_call_depth): Ditto.
* charset.c (show_host_charset_name, show_target_charset_name)
(initialize_charset): Ditto.
* breakpoint.c (show_can_use_hw_watchpoints)
(show_pending_break_support, _initialize_breakpoint): Ditto.
2005-02-24 21:51:36 +08:00
|
|
|
|
show_debug_infrun,
|
2005-02-18 Andrew Cagney <cagney@gnu.org>
Use add_setshow_zinteger_cmd through out. Re-sync gdbarch.sh
and gdbarch.c.
* breakpoint.c, frame.c, gdb-events.sh, gdbarch.sh: Update.
* gdbtypes.c, infrun.c, linux-nat.c, maint.c, monitor.c: Update.
* pa64solib.c, parse.c, remote-mips.c, ser-go32.c: Update.
* serial.c, solib-frv.c, somsolib.c, target.c, top.c: Update.
* varobj.c, cli/cli-cmds.c: Update.
* gdbarch.c, gdb-events.c: Regenerate.
2005-02-19 02:58:56 +08:00
|
|
|
|
&setdebuglist, &showdebuglist);
|
2004-11-09 01:25:23 +08:00
|
|
|
|
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
add_setshow_boolean_cmd ("displaced", class_maintenance, &debug_displaced, _("\
|
|
|
|
|
Set displaced stepping debugging."), _("\
|
|
|
|
|
Show displaced stepping debugging."), _("\
|
|
|
|
|
When non-zero, displaced stepping specific debugging is enabled."),
|
|
|
|
|
NULL,
|
|
|
|
|
show_debug_displaced,
|
|
|
|
|
&setdebuglist, &showdebuglist);
|
|
|
|
|
|
2008-07-10 06:27:13 +08:00
|
|
|
|
add_setshow_boolean_cmd ("non-stop", no_class,
|
|
|
|
|
&non_stop_1, _("\
|
|
|
|
|
Set whether gdb controls the inferior in non-stop mode."), _("\
|
|
|
|
|
Show whether gdb controls the inferior in non-stop mode."), _("\
|
|
|
|
|
When debugging a multi-threaded program and this setting is\n\
|
|
|
|
|
off (the default, also called all-stop mode), when one thread stops\n\
|
|
|
|
|
(for a breakpoint, watchpoint, exception, or similar events), GDB stops\n\
|
|
|
|
|
all other threads in the program while you interact with the thread of\n\
|
|
|
|
|
interest. When you continue or step a thread, you can allow the other\n\
|
|
|
|
|
threads to run, or have them remain stopped, but while you inspect any\n\
|
|
|
|
|
thread's state, all threads stop.\n\
|
|
|
|
|
\n\
|
|
|
|
|
In non-stop mode, when one thread stops, other threads can continue\n\
|
|
|
|
|
to run freely. You'll be able to step each thread independently,\n\
|
|
|
|
|
leave it stopped or free to run as needed."),
|
|
|
|
|
set_non_stop,
|
|
|
|
|
show_non_stop,
|
|
|
|
|
&setlist,
|
|
|
|
|
&showlist);
|
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
|
numsigs = (int) TARGET_SIGNAL_LAST;
|
2002-07-19 01:53:50 +08:00
|
|
|
|
signal_stop = (unsigned char *) xmalloc (sizeof (signal_stop[0]) * numsigs);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
signal_print = (unsigned char *)
|
|
|
|
|
xmalloc (sizeof (signal_print[0]) * numsigs);
|
|
|
|
|
signal_program = (unsigned char *)
|
|
|
|
|
xmalloc (sizeof (signal_program[0]) * numsigs);
|
|
|
|
|
for (i = 0; i < numsigs; i++)
|
|
|
|
|
{
|
|
|
|
|
signal_stop[i] = 1;
|
|
|
|
|
signal_print[i] = 1;
|
|
|
|
|
signal_program[i] = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Signals caused by debugger's own actions
|
|
|
|
|
should not be given to the program afterwards. */
|
|
|
|
|
signal_program[TARGET_SIGNAL_TRAP] = 0;
|
|
|
|
|
signal_program[TARGET_SIGNAL_INT] = 0;
|
|
|
|
|
|
|
|
|
|
/* Signals that are not errors should not normally enter the debugger. */
|
|
|
|
|
signal_stop[TARGET_SIGNAL_ALRM] = 0;
|
|
|
|
|
signal_print[TARGET_SIGNAL_ALRM] = 0;
|
|
|
|
|
signal_stop[TARGET_SIGNAL_VTALRM] = 0;
|
|
|
|
|
signal_print[TARGET_SIGNAL_VTALRM] = 0;
|
|
|
|
|
signal_stop[TARGET_SIGNAL_PROF] = 0;
|
|
|
|
|
signal_print[TARGET_SIGNAL_PROF] = 0;
|
|
|
|
|
signal_stop[TARGET_SIGNAL_CHLD] = 0;
|
|
|
|
|
signal_print[TARGET_SIGNAL_CHLD] = 0;
|
|
|
|
|
signal_stop[TARGET_SIGNAL_IO] = 0;
|
|
|
|
|
signal_print[TARGET_SIGNAL_IO] = 0;
|
|
|
|
|
signal_stop[TARGET_SIGNAL_POLL] = 0;
|
|
|
|
|
signal_print[TARGET_SIGNAL_POLL] = 0;
|
|
|
|
|
signal_stop[TARGET_SIGNAL_URG] = 0;
|
|
|
|
|
signal_print[TARGET_SIGNAL_URG] = 0;
|
|
|
|
|
signal_stop[TARGET_SIGNAL_WINCH] = 0;
|
|
|
|
|
signal_print[TARGET_SIGNAL_WINCH] = 0;
|
|
|
|
|
|
1999-05-11 21:35:55 +08:00
|
|
|
|
/* These signals are used internally by user-level thread
|
|
|
|
|
implementations. (See signal(5) on Solaris.) Like the above
|
|
|
|
|
signals, a healthy program receives and handles them as part of
|
|
|
|
|
its normal operation. */
|
|
|
|
|
signal_stop[TARGET_SIGNAL_LWP] = 0;
|
|
|
|
|
signal_print[TARGET_SIGNAL_LWP] = 0;
|
|
|
|
|
signal_stop[TARGET_SIGNAL_WAITING] = 0;
|
|
|
|
|
signal_print[TARGET_SIGNAL_WAITING] = 0;
|
|
|
|
|
signal_stop[TARGET_SIGNAL_CANCEL] = 0;
|
|
|
|
|
signal_print[TARGET_SIGNAL_CANCEL] = 0;
|
|
|
|
|
|
2005-02-18 Andrew Cagney <cagney@gnu.org>
Use add_setshow_zinteger_cmd through out. Re-sync gdbarch.sh
and gdbarch.c.
* breakpoint.c, frame.c, gdb-events.sh, gdbarch.sh: Update.
* gdbtypes.c, infrun.c, linux-nat.c, maint.c, monitor.c: Update.
* pa64solib.c, parse.c, remote-mips.c, ser-go32.c: Update.
* serial.c, solib-frv.c, somsolib.c, target.c, top.c: Update.
* varobj.c, cli/cli-cmds.c: Update.
* gdbarch.c, gdb-events.c: Regenerate.
2005-02-19 02:58:56 +08:00
|
|
|
|
add_setshow_zinteger_cmd ("stop-on-solib-events", class_support,
|
|
|
|
|
&stop_on_solib_events, _("\
|
|
|
|
|
Set stopping for shared library events."), _("\
|
|
|
|
|
Show stopping for shared library events."), _("\
|
1999-04-16 09:35:26 +08:00
|
|
|
|
If nonzero, gdb will give control to the user when the dynamic linker\n\
|
|
|
|
|
notifies gdb of shared library events. The most common event of interest\n\
|
2005-02-18 Andrew Cagney <cagney@gnu.org>
Use add_setshow_zinteger_cmd through out. Re-sync gdbarch.sh
and gdbarch.c.
* breakpoint.c, frame.c, gdb-events.sh, gdbarch.sh: Update.
* gdbtypes.c, infrun.c, linux-nat.c, maint.c, monitor.c: Update.
* pa64solib.c, parse.c, remote-mips.c, ser-go32.c: Update.
* serial.c, solib-frv.c, somsolib.c, target.c, top.c: Update.
* varobj.c, cli/cli-cmds.c: Update.
* gdbarch.c, gdb-events.c: Regenerate.
2005-02-19 02:58:56 +08:00
|
|
|
|
to the user would be loading/unloading of a new library."),
|
|
|
|
|
NULL,
|
2005-02-24 Andrew Cagney <cagney@gnu.org>
Add show_VARIABLE functions, update add_setshow call.
* varobj.c (_initialize_varobj, show_varobjdebug): Add and update.
* valprint.c (_initialize_valprint, show_print_max)
(show_stop_print_at_null, show_repeat_count_threshold)
(show_prettyprint_structs, show_unionprint)
(show_prettyprint_arrays, show_addressprint, show_input_radix)
(show_output_radix): Ditto.
* valops.c (_initialize_valops, show_overload_resolution): Ditto.
* utils.c (initialize_utils, show_chars_per_line)
(show_lines_per_page, show_demangle, show_pagination_enabled)
(show_sevenbit_strings, show_asm_demangle): Ditto
* tui/tui-win.c (_initialize_tui_win, show_tui_border_kind)
(show_tui_border_mode, show_tui_active_border_mode): Ditto.
* top.c (init_main, show_new_async_prompt)
(show_async_command_editing_p, show_write_history_p)
(show_history_size, show_history_filename, show_caution)
(show_annotation_level, init_main): Ditto.
* target.c (initialize_targets, show_targetdebug)
(show_trust_readonly): Ditto.
* symfile.c (_initialize_symfile, show_symbol_reloading)
(show_ext_args, show_download_write_size)
(show_debug_file_directory): Ditto.
* source.c (_initialize_source, show_lines_to_list): Ditto.
* solib.c (_initialize_solib, show_auto_solib_add)
(show_solib_search_path): Ditto.
* p-valprint.c (_initialize_pascal_valprint)
(show_pascal_static_field_print): Ditto.
* printcmd.c (_initialize_printcmd, show_max_symbolic_offset)
(show_print_symbol_filename): Add and update.
* parse.c (_initialize_parse, show_expressiondebug): Dito.
* observer.c (_initialize_observer, show_observer_debug): Dito.
* maint.c (_initialize_maint_cmds, show_watchdog)
(show_maintenance_profile_p): Dito.
* linux-nat.c (_initialize_linux_nat, show_debug_linux_nat): Dito.
* infrun.c (_initialize_infrun, show_debug_infrun)
(show_stop_on_solib_events, show_follow_fork_mode_string)
(show_scheduler_mode, show_step_stop_if_no_debug): Ditto.
* infcall.c (_initialize_infcall, show_coerce_float_to_double_p)
(show_unwind_on_signal_p): Ditto.
* gdbtypes.c (build_gdbtypes, show_opaque_type_resolution)
(_initialize_gdbtypes, show_overload_debug): Ditto.
* gdb-events.c, gdb-events.sh (_initialize_gdb_events)
(show_gdb_events_debug): Ditto.
* gdbarch.c, gdbarch.sh (show_gdbarch_debug)
(_initialize_gdbarch): Ditto.
* frame.c (_initialize_frame, show_backtrace_past_main)
(show_backtrace_past_entry, show_backtrace_limit)
(show_frame_debug): Ditto.
* exec.c (_initialize_exec, show_write_files): Ditto.
* dwarf2read.c (_initialize_dwarf2_read)
(show_dwarf2_max_cache_age): Ditto.
* demangle.c (_initialize_demangler)
(show_demangling_style_names): Ditto.
* dcache.c (_initialize_dcache, show_dcache_enabled_p): Ditto.
* cp-valprint.c (show_static_field_print)
(_initialize_cp_valprint, show_vtblprint, show_objectprint): Ditto.
* corefile.c (_initialize_core, show_gnutarget_string): Ditto.
* cli/cli-logging.c (_initialize_cli_logging)
(show_logging_overwrite, show_logging_redirect)
(show_logging_filename): Ditto.
* cli/cli-cmds.c (show_info_verbose, show_history_expansion_p)
(init_cli_cmds, show_baud_rate, show_remote_debug)
(show_remote_timeout, show_max_user_call_depth): Ditto.
* charset.c (show_host_charset_name, show_target_charset_name)
(initialize_charset): Ditto.
* breakpoint.c (show_can_use_hw_watchpoints)
(show_pending_break_support, _initialize_breakpoint): Ditto.
2005-02-24 21:51:36 +08:00
|
|
|
|
show_stop_on_solib_events,
|
2005-02-18 Andrew Cagney <cagney@gnu.org>
Use add_setshow_zinteger_cmd through out. Re-sync gdbarch.sh
and gdbarch.c.
* breakpoint.c, frame.c, gdb-events.sh, gdbarch.sh: Update.
* gdbtypes.c, infrun.c, linux-nat.c, maint.c, monitor.c: Update.
* pa64solib.c, parse.c, remote-mips.c, ser-go32.c: Update.
* serial.c, solib-frv.c, somsolib.c, target.c, top.c: Update.
* varobj.c, cli/cli-cmds.c: Update.
* gdbarch.c, gdb-events.c: Regenerate.
2005-02-19 02:58:56 +08:00
|
|
|
|
&setlist, &showlist);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
2005-02-21 12:31:59 +08:00
|
|
|
|
add_setshow_enum_cmd ("follow-fork-mode", class_run,
|
|
|
|
|
follow_fork_mode_kind_names,
|
|
|
|
|
&follow_fork_mode_string, _("\
|
|
|
|
|
Set debugger response to a program call of fork or vfork."), _("\
|
|
|
|
|
Show debugger response to a program call of fork or vfork."), _("\
|
1999-04-16 09:35:26 +08:00
|
|
|
|
A fork or vfork creates a new process. follow-fork-mode can be:\n\
|
|
|
|
|
parent - the original process is debugged after a fork\n\
|
|
|
|
|
child - the new process is debugged after a fork\n\
|
2004-01-14 05:31:43 +08:00
|
|
|
|
The unfollowed process will continue to run.\n\
|
2005-02-21 12:31:59 +08:00
|
|
|
|
By default, the debugger will follow the parent process."),
|
|
|
|
|
NULL,
|
2005-02-24 Andrew Cagney <cagney@gnu.org>
Add show_VARIABLE functions, update add_setshow call.
* varobj.c (_initialize_varobj, show_varobjdebug): Add and update.
* valprint.c (_initialize_valprint, show_print_max)
(show_stop_print_at_null, show_repeat_count_threshold)
(show_prettyprint_structs, show_unionprint)
(show_prettyprint_arrays, show_addressprint, show_input_radix)
(show_output_radix): Ditto.
* valops.c (_initialize_valops, show_overload_resolution): Ditto.
* utils.c (initialize_utils, show_chars_per_line)
(show_lines_per_page, show_demangle, show_pagination_enabled)
(show_sevenbit_strings, show_asm_demangle): Ditto
* tui/tui-win.c (_initialize_tui_win, show_tui_border_kind)
(show_tui_border_mode, show_tui_active_border_mode): Ditto.
* top.c (init_main, show_new_async_prompt)
(show_async_command_editing_p, show_write_history_p)
(show_history_size, show_history_filename, show_caution)
(show_annotation_level, init_main): Ditto.
* target.c (initialize_targets, show_targetdebug)
(show_trust_readonly): Ditto.
* symfile.c (_initialize_symfile, show_symbol_reloading)
(show_ext_args, show_download_write_size)
(show_debug_file_directory): Ditto.
* source.c (_initialize_source, show_lines_to_list): Ditto.
* solib.c (_initialize_solib, show_auto_solib_add)
(show_solib_search_path): Ditto.
* p-valprint.c (_initialize_pascal_valprint)
(show_pascal_static_field_print): Ditto.
* printcmd.c (_initialize_printcmd, show_max_symbolic_offset)
(show_print_symbol_filename): Add and update.
* parse.c (_initialize_parse, show_expressiondebug): Dito.
* observer.c (_initialize_observer, show_observer_debug): Dito.
* maint.c (_initialize_maint_cmds, show_watchdog)
(show_maintenance_profile_p): Dito.
* linux-nat.c (_initialize_linux_nat, show_debug_linux_nat): Dito.
* infrun.c (_initialize_infrun, show_debug_infrun)
(show_stop_on_solib_events, show_follow_fork_mode_string)
(show_scheduler_mode, show_step_stop_if_no_debug): Ditto.
* infcall.c (_initialize_infcall, show_coerce_float_to_double_p)
(show_unwind_on_signal_p): Ditto.
* gdbtypes.c (build_gdbtypes, show_opaque_type_resolution)
(_initialize_gdbtypes, show_overload_debug): Ditto.
* gdb-events.c, gdb-events.sh (_initialize_gdb_events)
(show_gdb_events_debug): Ditto.
* gdbarch.c, gdbarch.sh (show_gdbarch_debug)
(_initialize_gdbarch): Ditto.
* frame.c (_initialize_frame, show_backtrace_past_main)
(show_backtrace_past_entry, show_backtrace_limit)
(show_frame_debug): Ditto.
* exec.c (_initialize_exec, show_write_files): Ditto.
* dwarf2read.c (_initialize_dwarf2_read)
(show_dwarf2_max_cache_age): Ditto.
* demangle.c (_initialize_demangler)
(show_demangling_style_names): Ditto.
* dcache.c (_initialize_dcache, show_dcache_enabled_p): Ditto.
* cp-valprint.c (show_static_field_print)
(_initialize_cp_valprint, show_vtblprint, show_objectprint): Ditto.
* corefile.c (_initialize_core, show_gnutarget_string): Ditto.
* cli/cli-logging.c (_initialize_cli_logging)
(show_logging_overwrite, show_logging_redirect)
(show_logging_filename): Ditto.
* cli/cli-cmds.c (show_info_verbose, show_history_expansion_p)
(init_cli_cmds, show_baud_rate, show_remote_debug)
(show_remote_timeout, show_max_user_call_depth): Ditto.
* charset.c (show_host_charset_name, show_target_charset_name)
(initialize_charset): Ditto.
* breakpoint.c (show_can_use_hw_watchpoints)
(show_pending_break_support, _initialize_breakpoint): Ditto.
2005-02-24 21:51:36 +08:00
|
|
|
|
show_follow_fork_mode_string,
|
2005-02-21 12:31:59 +08:00
|
|
|
|
&setlist, &showlist);
|
|
|
|
|
|
|
|
|
|
add_setshow_enum_cmd ("scheduler-locking", class_run,
|
|
|
|
|
scheduler_enums, &scheduler_mode, _("\
|
|
|
|
|
Set mode for locking scheduler during execution."), _("\
|
|
|
|
|
Show mode for locking scheduler during execution."), _("\
|
1999-04-16 09:35:26 +08:00
|
|
|
|
off == no locking (threads may preempt at any time)\n\
|
|
|
|
|
on == full locking (no thread except the current thread may run)\n\
|
|
|
|
|
step == scheduler locked during every single-step operation.\n\
|
|
|
|
|
In this mode, no other thread may run during a step command.\n\
|
2005-02-21 12:31:59 +08:00
|
|
|
|
Other threads may run while stepping over a function call ('next')."),
|
|
|
|
|
set_schedlock_func, /* traps on target vector */
|
2005-02-24 Andrew Cagney <cagney@gnu.org>
Add show_VARIABLE functions, update add_setshow call.
* varobj.c (_initialize_varobj, show_varobjdebug): Add and update.
* valprint.c (_initialize_valprint, show_print_max)
(show_stop_print_at_null, show_repeat_count_threshold)
(show_prettyprint_structs, show_unionprint)
(show_prettyprint_arrays, show_addressprint, show_input_radix)
(show_output_radix): Ditto.
* valops.c (_initialize_valops, show_overload_resolution): Ditto.
* utils.c (initialize_utils, show_chars_per_line)
(show_lines_per_page, show_demangle, show_pagination_enabled)
(show_sevenbit_strings, show_asm_demangle): Ditto
* tui/tui-win.c (_initialize_tui_win, show_tui_border_kind)
(show_tui_border_mode, show_tui_active_border_mode): Ditto.
* top.c (init_main, show_new_async_prompt)
(show_async_command_editing_p, show_write_history_p)
(show_history_size, show_history_filename, show_caution)
(show_annotation_level, init_main): Ditto.
* target.c (initialize_targets, show_targetdebug)
(show_trust_readonly): Ditto.
* symfile.c (_initialize_symfile, show_symbol_reloading)
(show_ext_args, show_download_write_size)
(show_debug_file_directory): Ditto.
* source.c (_initialize_source, show_lines_to_list): Ditto.
* solib.c (_initialize_solib, show_auto_solib_add)
(show_solib_search_path): Ditto.
* p-valprint.c (_initialize_pascal_valprint)
(show_pascal_static_field_print): Ditto.
* printcmd.c (_initialize_printcmd, show_max_symbolic_offset)
(show_print_symbol_filename): Add and update.
* parse.c (_initialize_parse, show_expressiondebug): Dito.
* observer.c (_initialize_observer, show_observer_debug): Dito.
* maint.c (_initialize_maint_cmds, show_watchdog)
(show_maintenance_profile_p): Dito.
* linux-nat.c (_initialize_linux_nat, show_debug_linux_nat): Dito.
* infrun.c (_initialize_infrun, show_debug_infrun)
(show_stop_on_solib_events, show_follow_fork_mode_string)
(show_scheduler_mode, show_step_stop_if_no_debug): Ditto.
* infcall.c (_initialize_infcall, show_coerce_float_to_double_p)
(show_unwind_on_signal_p): Ditto.
* gdbtypes.c (build_gdbtypes, show_opaque_type_resolution)
(_initialize_gdbtypes, show_overload_debug): Ditto.
* gdb-events.c, gdb-events.sh (_initialize_gdb_events)
(show_gdb_events_debug): Ditto.
* gdbarch.c, gdbarch.sh (show_gdbarch_debug)
(_initialize_gdbarch): Ditto.
* frame.c (_initialize_frame, show_backtrace_past_main)
(show_backtrace_past_entry, show_backtrace_limit)
(show_frame_debug): Ditto.
* exec.c (_initialize_exec, show_write_files): Ditto.
* dwarf2read.c (_initialize_dwarf2_read)
(show_dwarf2_max_cache_age): Ditto.
* demangle.c (_initialize_demangler)
(show_demangling_style_names): Ditto.
* dcache.c (_initialize_dcache, show_dcache_enabled_p): Ditto.
* cp-valprint.c (show_static_field_print)
(_initialize_cp_valprint, show_vtblprint, show_objectprint): Ditto.
* corefile.c (_initialize_core, show_gnutarget_string): Ditto.
* cli/cli-logging.c (_initialize_cli_logging)
(show_logging_overwrite, show_logging_redirect)
(show_logging_filename): Ditto.
* cli/cli-cmds.c (show_info_verbose, show_history_expansion_p)
(init_cli_cmds, show_baud_rate, show_remote_debug)
(show_remote_timeout, show_max_user_call_depth): Ditto.
* charset.c (show_host_charset_name, show_target_charset_name)
(initialize_charset): Ditto.
* breakpoint.c (show_can_use_hw_watchpoints)
(show_pending_break_support, _initialize_breakpoint): Ditto.
2005-02-24 21:51:36 +08:00
|
|
|
|
show_scheduler_mode,
|
2005-02-21 12:31:59 +08:00
|
|
|
|
&setlist, &showlist);
|
2000-11-11 03:27:45 +08:00
|
|
|
|
|
2005-02-18 Andrew Cagney <cagney@gnu.org>
Use add_setshow_boolean_command through out. Delete #ifdef 0'ed
code adding set/show boolean commands.
* cp-valprint.c, dcache.c, exec.c, gdbtypes.c, infrun.c: Update.
* monitor.c, p-valprint.c, pa64solib.c, printcmd.c: Update.
* proc-api.c, remote-mips.c, remote.c, solib.c: Update.
* somsolib.c, symfile.c, top.c, utils.c, valops.c: Update.
* valprint.c, win32-nat.c, wince.c, xcoffsolib.c: Update.
* cli/cli-cmds.c: Update.
2005-02-18 23:25:32 +08:00
|
|
|
|
add_setshow_boolean_cmd ("step-mode", class_run, &step_stop_if_no_debug, _("\
|
|
|
|
|
Set mode of the step operation."), _("\
|
|
|
|
|
Show mode of the step operation."), _("\
|
|
|
|
|
When set, doing a step over a function without debug line information\n\
|
|
|
|
|
will stop at the first instruction of that function. Otherwise, the\n\
|
|
|
|
|
function is skipped and the step command stops at a different source line."),
|
|
|
|
|
NULL,
|
2005-02-24 Andrew Cagney <cagney@gnu.org>
Add show_VARIABLE functions, update add_setshow call.
* varobj.c (_initialize_varobj, show_varobjdebug): Add and update.
* valprint.c (_initialize_valprint, show_print_max)
(show_stop_print_at_null, show_repeat_count_threshold)
(show_prettyprint_structs, show_unionprint)
(show_prettyprint_arrays, show_addressprint, show_input_radix)
(show_output_radix): Ditto.
* valops.c (_initialize_valops, show_overload_resolution): Ditto.
* utils.c (initialize_utils, show_chars_per_line)
(show_lines_per_page, show_demangle, show_pagination_enabled)
(show_sevenbit_strings, show_asm_demangle): Ditto
* tui/tui-win.c (_initialize_tui_win, show_tui_border_kind)
(show_tui_border_mode, show_tui_active_border_mode): Ditto.
* top.c (init_main, show_new_async_prompt)
(show_async_command_editing_p, show_write_history_p)
(show_history_size, show_history_filename, show_caution)
(show_annotation_level, init_main): Ditto.
* target.c (initialize_targets, show_targetdebug)
(show_trust_readonly): Ditto.
* symfile.c (_initialize_symfile, show_symbol_reloading)
(show_ext_args, show_download_write_size)
(show_debug_file_directory): Ditto.
* source.c (_initialize_source, show_lines_to_list): Ditto.
* solib.c (_initialize_solib, show_auto_solib_add)
(show_solib_search_path): Ditto.
* p-valprint.c (_initialize_pascal_valprint)
(show_pascal_static_field_print): Ditto.
* printcmd.c (_initialize_printcmd, show_max_symbolic_offset)
(show_print_symbol_filename): Add and update.
* parse.c (_initialize_parse, show_expressiondebug): Dito.
* observer.c (_initialize_observer, show_observer_debug): Dito.
* maint.c (_initialize_maint_cmds, show_watchdog)
(show_maintenance_profile_p): Dito.
* linux-nat.c (_initialize_linux_nat, show_debug_linux_nat): Dito.
* infrun.c (_initialize_infrun, show_debug_infrun)
(show_stop_on_solib_events, show_follow_fork_mode_string)
(show_scheduler_mode, show_step_stop_if_no_debug): Ditto.
* infcall.c (_initialize_infcall, show_coerce_float_to_double_p)
(show_unwind_on_signal_p): Ditto.
* gdbtypes.c (build_gdbtypes, show_opaque_type_resolution)
(_initialize_gdbtypes, show_overload_debug): Ditto.
* gdb-events.c, gdb-events.sh (_initialize_gdb_events)
(show_gdb_events_debug): Ditto.
* gdbarch.c, gdbarch.sh (show_gdbarch_debug)
(_initialize_gdbarch): Ditto.
* frame.c (_initialize_frame, show_backtrace_past_main)
(show_backtrace_past_entry, show_backtrace_limit)
(show_frame_debug): Ditto.
* exec.c (_initialize_exec, show_write_files): Ditto.
* dwarf2read.c (_initialize_dwarf2_read)
(show_dwarf2_max_cache_age): Ditto.
* demangle.c (_initialize_demangler)
(show_demangling_style_names): Ditto.
* dcache.c (_initialize_dcache, show_dcache_enabled_p): Ditto.
* cp-valprint.c (show_static_field_print)
(_initialize_cp_valprint, show_vtblprint, show_objectprint): Ditto.
* corefile.c (_initialize_core, show_gnutarget_string): Ditto.
* cli/cli-logging.c (_initialize_cli_logging)
(show_logging_overwrite, show_logging_redirect)
(show_logging_filename): Ditto.
* cli/cli-cmds.c (show_info_verbose, show_history_expansion_p)
(init_cli_cmds, show_baud_rate, show_remote_debug)
(show_remote_timeout, show_max_user_call_depth): Ditto.
* charset.c (show_host_charset_name, show_target_charset_name)
(initialize_charset): Ditto.
* breakpoint.c (show_can_use_hw_watchpoints)
(show_pending_break_support, _initialize_breakpoint): Ditto.
2005-02-24 21:51:36 +08:00
|
|
|
|
show_step_stop_if_no_debug,
|
2005-02-18 Andrew Cagney <cagney@gnu.org>
Use add_setshow_boolean_command through out. Delete #ifdef 0'ed
code adding set/show boolean commands.
* cp-valprint.c, dcache.c, exec.c, gdbtypes.c, infrun.c: Update.
* monitor.c, p-valprint.c, pa64solib.c, printcmd.c: Update.
* proc-api.c, remote-mips.c, remote.c, solib.c: Update.
* somsolib.c, symfile.c, top.c, utils.c, valops.c: Update.
* valprint.c, win32-nat.c, wince.c, xcoffsolib.c: Update.
* cli/cli-cmds.c: Update.
2005-02-18 23:25:32 +08:00
|
|
|
|
&setlist, &showlist);
|
2001-05-15 08:03:38 +08:00
|
|
|
|
|
2008-10-24 10:31:41 +08:00
|
|
|
|
add_setshow_enum_cmd ("displaced-stepping", class_run,
|
|
|
|
|
can_use_displaced_stepping_enum,
|
|
|
|
|
&can_use_displaced_stepping, _("\
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
Set debugger's willingness to use displaced stepping."), _("\
|
|
|
|
|
Show debugger's willingness to use displaced stepping."), _("\
|
2008-10-24 10:31:41 +08:00
|
|
|
|
If on, gdb will use displaced stepping to step over breakpoints if it is\n\
|
|
|
|
|
supported by the target architecture. If off, gdb will not use displaced\n\
|
|
|
|
|
stepping to step over breakpoints, even if such is supported by the target\n\
|
|
|
|
|
architecture. If auto (which is the default), gdb will use displaced stepping\n\
|
|
|
|
|
if the target architecture supports it and non-stop mode is active, but will not\n\
|
|
|
|
|
use it in all-stop mode (see help set non-stop)."),
|
|
|
|
|
NULL,
|
|
|
|
|
show_can_use_displaced_stepping,
|
|
|
|
|
&setlist, &showlist);
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
|
2008-10-18 03:43:47 +08:00
|
|
|
|
add_setshow_enum_cmd ("exec-direction", class_run, exec_direction_names,
|
|
|
|
|
&exec_direction, _("Set direction of execution.\n\
|
|
|
|
|
Options are 'forward' or 'reverse'."),
|
|
|
|
|
_("Show direction of execution (forward/reverse)."),
|
|
|
|
|
_("Tells gdb whether to execute forward or backward."),
|
|
|
|
|
set_exec_direction_func, show_exec_direction_func,
|
|
|
|
|
&setlist, &showlist);
|
|
|
|
|
|
2001-05-15 08:03:38 +08:00
|
|
|
|
/* ptid initializations */
|
|
|
|
|
null_ptid = ptid_build (0, 0, 0);
|
|
|
|
|
minus_one_ptid = ptid_build (-1, 0, 0);
|
|
|
|
|
inferior_ptid = null_ptid;
|
|
|
|
|
target_last_wait_ptid = minus_one_ptid;
|
Implement displaced stepping.
gdb/
* gdbarch.sh (max_insn_length): New 'variable'.
(displaced_step_copy, displaced_step_fixup)
(displaced_step_free_closure, displaced_step_location): New
functions.
(struct displaced_step_closure): Add forward declaration.
* gdbarch.c, gdbarch.h: Regenerated.
* arch-utils.c: #include "objfiles.h".
(simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New functions.
* arch-utils.h (simple_displaced_step_copy_insn)
(simple_displaced_step_free_closure)
(displaced_step_at_entry_point): New prototypes.
* i386-tdep.c (I386_MAX_INSN_LEN): Rename to...
(I386_MAX_MATCHED_INSN_LEN): ... this.
(i386_absolute_jmp_p, i386_absolute_call_p)
(i386_ret_p, i386_call_p, i386_breakpoint_p, i386_syscall_p)
(i386_displaced_step_fixup): New functions.
(struct i386_insn, i386_match_insn): Update.
(i386_gdbarch_init): Set gdbarch_max_insn_length.
* i386-tdep.h (I386_MAX_INSN_LEN): New.
(i386_displaced_step_fixup): New prototype.
* i386-linux-tdep.c (i386_linux_init_abi): Include "arch-utils.h".
Register gdbarch_displaced_step_copy,
gdbarch_displaced_step_fixup, gdbarch_displaced_step_free_closure,
and gdbarch_displaced_step_location functions.
* infrun.c (debug_displaced): New variable.
(show_debug_displaced): New function.
(struct displaced_step_request): New struct.
(displaced_step_request_queue, displaced_step_ptid)
(displaced_step_gdbarch, displaced_step_closure)
(displaced_step_original, displaced_step_copy)
(displaced_step_saved_copy, can_use_displaced_stepping): New
variables.
(show_can_use_displaced_stepping, use_displaced_stepping)
(displaced_step_clear, cleanup_displaced_step_closure)
(displaced_step_dump_bytes, displaced_step_prepare)
(displaced_step_clear_cleanup, write_memory_ptid)
(displaced_step_fixup): New functions.
(resume): Call displaced_step_prepare.
(proceed): Call read_pc once, and remember the value. If using
displaced stepping, don't remove breakpoints.
(handle_inferior_event): Call displaced_step_fixup. Add some
debugging output. When we try to step over a breakpoint, but get
a signal to deliver to the thread instead, ensure the step-resume
breakpoint is actually inserted. If a thread hop is needed, and
displaced stepping is enabled, don't remove breakpoints.
(init_wait_for_inferior): Call displaced_step_clear.
(_initialize_infrun): Add "set debug displaced" command. Add
"maint set can-use-displaced-stepping" command. Clear
displaced_step_ptid.
* inferior.h (debug_displaced): Declare variable.
(displaced_step_dump_bytes): Declare function.
* Makefile.in (arch-utils.o, i386-linux-tdep.o): Update
dependencies.
gdb/testsuite/
* gdb.asm/asmsrc1.s: Add scratch space.
gdb/doc/
* gdb.texinfo (Debugging Output): Document "set/show debug
displaced".
(Maintenance Commands): Document "maint set/show
can-use-displaced-stepping".
2008-05-03 00:49:54 +08:00
|
|
|
|
displaced_step_ptid = null_ptid;
|
2008-08-19 06:35:17 +08:00
|
|
|
|
|
|
|
|
|
observer_attach_thread_ptid_changed (infrun_thread_ptid_changed);
|
2008-10-24 07:11:21 +08:00
|
|
|
|
observer_attach_thread_stop_requested (infrun_thread_stop_requested);
|
2009-03-26 05:53:11 +08:00
|
|
|
|
observer_attach_thread_exit (infrun_thread_thread_exit);
|
2009-02-07 06:59:01 +08:00
|
|
|
|
|
|
|
|
|
/* Explicitly create without lookup, since that tries to create a
|
|
|
|
|
value with a void typed value, and when we get here, gdbarch
|
|
|
|
|
isn't initialized yet. At this point, we're quite sure there
|
|
|
|
|
isn't another convenience variable of the same name. */
|
|
|
|
|
create_internalvar_type_lazy ("_siginfo", siginfo_make_value);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
}
|