mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-25 02:53:48 +08:00
223ffa714c
This removes make_cleanup_restore_target_terminal and generally C++-ifies target terminal handling. It changes all target_terminal_* functions to be static members of a new target_terminal class and changes the cleanup to be a scoped_* class. make_cleanup_override_quit_handler is also removed in favor of simply using scoped_restore. Note that there are some files in this patch that I could not compile. Considering that some of the rewrites were automated, and that none of these files involed cleanups, I feel that this is relatively safe. Regression tested by the buildbot. gdb/ChangeLog 2017-09-20 Tom Tromey <tom@tromey.com> * windows-nat.c (get_windows_debug_event, windows_wait) (do_initial_windows_stuff, windows_attach): Update. * utils.c (vwarning, internal_vproblem): Update. (ui_unregister_input_event_handler_cleanup) (prepare_to_handle_input): Remove. (class scoped_input_handler): New. (defaulted_query, prompt_for_continue): Update. * tui/tui-hooks.c (tui_refresh_frame_and_register_information): Update. * top.c (undo_terminal_modifications_before_exit): Update. * target/target.h (target_terminal_init, target_terminal_inferior) (target_terminal_ours): Don't declare. (class target_terminal): New. * target.h (target_terminal_is_inferior, target_terminal_is_ours) (target_terminal_ours_for_output) (make_cleanup_restore_target_terminal): Don't declare. (target_terminal_info): Remove. * target.c (enum terminal_state, terminal_state): Remove. (target_terminal::terminal_state): Define. (target_terminal::init): Rename from target_terminal_init. (target_terminal::inferior): Rename from target_terminal_inferior. (target_terminal::ours): Rename from target_terminal_ours. (target_terminal::ours_for_output): Rename from target_terminal_ours_for_output. (target_terminal::info): New method. (cleanup_restore_target_terminal) (make_cleanup_restore_target_terminal): Remove. * solib.c (handle_solib_event): Update. * remote.c (remote_serial_quit_handler): Update. (remote_terminal_inferior, remote_wait_as): Update. * record-full.c (record_full_wait_1): Update. * nto-procfs.c (procfs_create_inferior): Update. * nat/fork-inferior.c (startup_inferior): Update. * mi/mi-interp.c (mi_new_thread, mi_thread_exit) (mi_record_changed, mi_inferior_added, mi_inferior_appeared) (mi_inferior_exit, mi_inferior_removed, mi_traceframe_changed) (mi_tsv_created, mi_tsv_deleted, mi_tsv_modified) (mi_breakpoint_created, mi_breakpoint_deleted) (mi_breakpoint_modified, mi_on_resume, mi_solib_loaded) (mi_solib_unloaded, mi_command_param_changed, mi_memory_changed) (mi_user_selected_context_changed, report_initial_inferior): Update. * linux-nat.c (linux_nat_attach, linux_nat_terminal_ours) (linux_nat_terminal_inferior): Update. * infrun.c (follow_fork_inferior) (handle_vfork_child_exec_or_exit, do_target_resume) (check_curr_ui_sync_execution_done, handle_inferior_event_1) (handle_signal_stop, maybe_remove_breakpoints, normal_stop): Update. * inflow.c (child_terminal_init, info_terminal_command): Update. * infcmd.c (post_create_inferior, continue_1, prepare_one_step) (attach_command): Update. * infcall.c (call_thread_fsm_should_stop): Update. * gnu-nat.c (gnu_attach): Update. * extension.c (struct active_ext_lang_state) (restore_active_ext_lang): Update. * exceptions.c (print_flush): Update. * event-top.c (async_enable_stdin, default_quit_handler): Update. (struct quit_handler_cleanup_data, restore_quit_handler) (restore_quit_handler_dtor, make_cleanup_override_quit_handler): Remove. * cp-support.c (gdb_demangle): Update. * breakpoint.c (update_inserted_breakpoint_locations) (insert_breakpoint_locations, handle_jit_event) (disable_breakpoints_in_unloaded_shlib): Update. * annotate.c (annotate_breakpoints_invalid) (annotate_frames_invalid): Update. gdb/gdbserver/ChangeLog 2017-09-20 Tom Tromey <tom@tromey.com> * target.c (target_terminal::terminal_state): Define. (target_terminal::init): Rename from target_terminal_init. (target_terminal::inferior): Rename from target_terminal_inferior. (target_terminal::ours): Rename from target_terminal_ours. (target_terminal::ours_for_output, target_terminal::info): New.
204 lines
6.7 KiB
C++
204 lines
6.7 KiB
C++
/* Declarations for common target functions.
|
|
|
|
Copyright (C) 1986-2017 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
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
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
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.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef TARGET_COMMON_H
|
|
#define TARGET_COMMON_H
|
|
|
|
#include "target/waitstatus.h"
|
|
/* This header is a stopgap until more code is shared. */
|
|
|
|
/* Read LEN bytes of target memory at address MEMADDR, placing the
|
|
results in GDB's memory at MYADDR. Return zero for success,
|
|
nonzero if any error occurs. This function must be provided by
|
|
the client. Implementations of this function may define and use
|
|
their own error codes, but functions in the common, nat and target
|
|
directories must treat the return code as opaque. No guarantee is
|
|
made about the contents of the data at MYADDR if any error
|
|
occurs. */
|
|
|
|
extern int target_read_memory (CORE_ADDR memaddr, gdb_byte *myaddr,
|
|
ssize_t len);
|
|
|
|
/* Read an unsigned 32-bit integer in the target's format from target
|
|
memory at address MEMADDR, storing the result in GDB's format in
|
|
GDB's memory at RESULT. Return zero for success, nonzero if any
|
|
error occurs. This function must be provided by the client.
|
|
Implementations of this function may define and use their own error
|
|
codes, but functions in the common, nat and target directories must
|
|
treat the return code as opaque. No guarantee is made about the
|
|
contents of the data at RESULT if any error occurs. */
|
|
|
|
extern int target_read_uint32 (CORE_ADDR memaddr, uint32_t *result);
|
|
|
|
/* Write LEN bytes from MYADDR to target memory at address MEMADDR.
|
|
Return zero for success, nonzero if any error occurs. This
|
|
function must be provided by the client. Implementations of this
|
|
function may define and use their own error codes, but functions
|
|
in the common, nat and target directories must treat the return
|
|
code as opaque. No guarantee is made about the contents of the
|
|
data at MEMADDR if any error occurs. */
|
|
|
|
extern int target_write_memory (CORE_ADDR memaddr, const gdb_byte *myaddr,
|
|
ssize_t len);
|
|
|
|
/* Cause the target to stop in a continuable fashion--for instance,
|
|
under Unix, this should act like SIGSTOP--and wait for the target
|
|
to be stopped before returning. This function must be provided by
|
|
the client. */
|
|
|
|
extern void target_stop_and_wait (ptid_t ptid);
|
|
|
|
/* Restart a target previously stopped. No signal is delivered to the
|
|
target. This function must be provided by the client. */
|
|
|
|
extern void target_continue_no_signal (ptid_t ptid);
|
|
|
|
/* Restart a target previously stopped. SIGNAL is delivered to the
|
|
target. This function must be provided by the client. */
|
|
|
|
extern void target_continue (ptid_t ptid, enum gdb_signal signal);
|
|
|
|
/* Wait for process pid to do something. PTID = -1 to wait for any
|
|
pid to do something. Return pid of child, or -1 in case of error;
|
|
store status through argument pointer STATUS. Note that it is
|
|
_NOT_ OK to throw_exception() out of target_wait() without popping
|
|
the debugging target from the stack; GDB isn't prepared to get back
|
|
to the prompt with a debugging target but without the frame cache,
|
|
stop_pc, etc., set up. OPTIONS is a bitwise OR of TARGET_W*
|
|
options. */
|
|
|
|
extern ptid_t target_wait (ptid_t ptid, struct target_waitstatus *status,
|
|
int options);
|
|
|
|
/* The inferior process has died. Do what is right. */
|
|
|
|
extern void target_mourn_inferior (ptid_t ptid);
|
|
|
|
/* Return 1 if this target can debug multiple processes
|
|
simultaneously, zero otherwise. */
|
|
|
|
extern int target_supports_multi_process (void);
|
|
|
|
/* Represents the state of the target terminal. */
|
|
class target_terminal
|
|
{
|
|
public:
|
|
|
|
target_terminal () = delete;
|
|
~target_terminal () = delete;
|
|
DISABLE_COPY_AND_ASSIGN (target_terminal);
|
|
|
|
/* Initialize the terminal settings we record for the inferior,
|
|
before we actually run the inferior. */
|
|
static void init ();
|
|
|
|
/* Put the inferior's terminal settings into effect. This is
|
|
preparation for starting or resuming the inferior. This is a no-op
|
|
unless called with the main UI as current UI. */
|
|
static void inferior ();
|
|
|
|
/* Put our terminal settings into effect. First record the inferior's
|
|
terminal settings so they can be restored properly later. This is
|
|
a no-op unless called with the main UI as current UI. */
|
|
static void ours ();
|
|
|
|
/* Put some of our terminal settings into effect, enough to get proper
|
|
results from our output, but do not change into or out of RAW mode
|
|
so that no input is discarded. This is a no-op if terminal_ours
|
|
was most recently called. This is a no-op unless called with the main
|
|
UI as current UI. */
|
|
static void ours_for_output ();
|
|
|
|
/* Returns true if the terminal settings of the inferior are in
|
|
effect. */
|
|
static bool is_inferior ()
|
|
{
|
|
return terminal_state == terminal_is_inferior;
|
|
}
|
|
|
|
/* Returns true if our terminal settings are in effect. */
|
|
static bool is_ours ()
|
|
{
|
|
return terminal_state == terminal_is_ours;
|
|
}
|
|
|
|
/* Print useful information about our terminal status, if such a thing
|
|
exists. */
|
|
static void info (const char *arg, int from_tty);
|
|
|
|
private:
|
|
|
|
/* Possible terminal states. */
|
|
|
|
enum terminal_state
|
|
{
|
|
/* The inferior's terminal settings are in effect. */
|
|
terminal_is_inferior = 0,
|
|
|
|
/* Some of our terminal settings are in effect, enough to get
|
|
proper output. */
|
|
terminal_is_ours_for_output = 1,
|
|
|
|
/* Our terminal settings are in effect, for output and input. */
|
|
terminal_is_ours = 2
|
|
};
|
|
|
|
public:
|
|
|
|
/* A class that restores the state of the terminal to the current
|
|
state. */
|
|
class scoped_restore_terminal_state
|
|
{
|
|
public:
|
|
|
|
scoped_restore_terminal_state ()
|
|
: m_state (terminal_state)
|
|
{
|
|
}
|
|
|
|
~scoped_restore_terminal_state ()
|
|
{
|
|
switch (m_state)
|
|
{
|
|
case terminal_is_ours:
|
|
ours ();
|
|
break;
|
|
case terminal_is_ours_for_output:
|
|
ours_for_output ();
|
|
break;
|
|
case terminal_is_inferior:
|
|
inferior ();
|
|
break;
|
|
}
|
|
}
|
|
|
|
DISABLE_COPY_AND_ASSIGN (scoped_restore_terminal_state);
|
|
|
|
private:
|
|
|
|
target_terminal::terminal_state m_state;
|
|
};
|
|
|
|
private:
|
|
|
|
static terminal_state terminal_state;
|
|
};
|
|
|
|
#endif /* TARGET_COMMON_H */
|