mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-21 04:42:53 +08:00
46e3ed7ff9
This C++-ifies struct thread_fsm, replacing the "ops" structure with virtual methods, and changing all the implementations to derive from thread_fsm. gdb/ChangeLog 2019-02-07 Tom Tromey <tom@tromey.com> * thread.c (thread_cancel_execution_command): Update. * thread-fsm.h (struct thread_fsm): Add constructor, destructor, methods. (struct thread_fsm_ops): Remove. (thread_fsm_ctor, thread_fsm_delete, thread_fsm_clean_up) (thread_fsm_should_stop, thread_fsm_return_value) (thread_fsm_set_finished, thread_fsm_finished_p) (thread_fsm_async_reply_reason, thread_fsm_should_notify_stop): Don't declare. * mi/mi-interp.c (mi_on_normal_stop_1): Update. * infrun.c (clear_proceed_status_thread) (clean_up_just_stopped_threads_fsms, fetch_inferior_event) (print_stop_event): Update. * infcmd.c (struct step_command_fsm): Inherit from thread_fsm. Add constructor. (step_command_fsm_ops): Remove. (new_step_command_fsm): Remove. (step_1): Update. (step_command_fsm::should_stop): Rename from step_command_fsm_should_stop. (step_command_fsm::clean_up): Rename from step_command_fsm_clean_up. (step_command_fsm::do_async_reply_reason): Rename from step_command_fsm_async_reply_reason. (struct until_next_fsm): Inherit from thread_fsm. Add constructor. (until_next_fsm_ops): Remove. (new_until_next_fsm): Remove. (until_next_fsm::should_stop): Rename from until_next_fsm_should_stop. (until_next_fsm::clean_up): Rename from until_next_fsm_clean_up. (until_next_fsm::do_async_reply_reason): Rename from until_next_fsm_async_reply_reason. (struct finish_command_fsm): Inherit from thread_fsm. Add constructor. Change type of breakpoint. (finish_command_fsm_ops): Remove. (new_finish_command_fsm): Remove. (finish_command_fsm::should_stop): Rename from finish_command_fsm_should_stop. (finish_command_fsm::clean_up): Rename from finish_command_fsm_clean_up. (finish_command_fsm::return_value): Rename from finish_command_fsm_return_value. (finish_command_fsm::do_async_reply_reason): Rename from finish_command_fsm_async_reply_reason. (finish_command): Update. * infcall.c (struct call_thread_fsm): Inherit from thread_fsm. Add constructor. (call_thread_fsm_ops): Remove. (call_thread_fsm::call_thread_fsm): Rename from new_call_thread_fsm. (call_thread_fsm::should_stop): Rename from call_thread_fsm_should_stop. (call_thread_fsm::should_notify_stop): Rename from call_thread_fsm_should_notify_stop. (run_inferior_call, call_function_by_hand_dummy): Update. * cli/cli-interp.c (should_print_stop_to_console): Update. * breakpoint.c (struct until_break_fsm): Inherit from thread_fsm. Add constructor. Change type of location_breakpoint, caller_breakpoint. (until_break_fsm_ops): Remove. (new_until_break_fsm): Remove. (until_break_fsm::should_stop): Rename from until_break_fsm_should_stop. (until_break_fsm::clean_up): Rename from until_break_fsm_clean_up. (until_break_fsm::do_async_reply_reason): Rename from until_break_fsm_async_reply_reason. (until_break_command): Update. * thread-fsm.c: Remove. * Makefile.in (COMMON_SFILES): Remove thread-fsm.c.
114 lines
3.6 KiB
C++
114 lines
3.6 KiB
C++
/* Thread command's finish-state machine, for GDB, the GNU debugger.
|
|
Copyright (C) 2015-2019 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 THREAD_FSM_H
|
|
#define THREAD_FSM_H
|
|
|
|
#include "mi/mi-common.h" /* For enum async_reply_reason. */
|
|
|
|
struct return_value_info;
|
|
struct thread_fsm_ops;
|
|
|
|
/* A thread finite-state machine structure contains the necessary info
|
|
and callbacks to manage the state machine protocol of a thread's
|
|
execution command. */
|
|
|
|
struct thread_fsm
|
|
{
|
|
explicit thread_fsm (struct interp *cmd_interp)
|
|
: command_interp (cmd_interp)
|
|
{
|
|
}
|
|
|
|
/* The destructor. This should simply free heap allocated data
|
|
structures. Cleaning up target resources (like, e.g.,
|
|
breakpoints) should be done in the clean_up method. */
|
|
virtual ~thread_fsm () = default;
|
|
|
|
DISABLE_COPY_AND_ASSIGN (thread_fsm);
|
|
|
|
/* Called to clean up target resources after the FSM. E.g., if the
|
|
FSM created internal breakpoints, this is where they should be
|
|
deleted. */
|
|
virtual void clean_up (struct thread_info *thread)
|
|
{
|
|
}
|
|
|
|
/* Called after handle_inferior_event decides the target is done
|
|
(that is, after stop_waiting). The FSM is given a chance to
|
|
decide whether the command is done and thus the target should
|
|
stop, or whether there's still more to do and thus the thread
|
|
should be re-resumed. This is a good place to cache target data
|
|
too. For example, the "finish" command saves the just-finished
|
|
function's return value here. */
|
|
virtual bool should_stop (struct thread_info *thread) = 0;
|
|
|
|
/* If this FSM saved a function's return value, you can use this
|
|
method to retrieve it. Otherwise, this returns NULL. */
|
|
virtual struct return_value_info *return_value ()
|
|
{
|
|
return nullptr;
|
|
}
|
|
|
|
enum async_reply_reason async_reply_reason ()
|
|
{
|
|
/* If we didn't finish, then the stop reason must come from
|
|
elsewhere. E.g., a breakpoint hit or a signal intercepted. */
|
|
gdb_assert (finished_p ());
|
|
return do_async_reply_reason ();
|
|
}
|
|
|
|
/* Whether the stop should be notified to the user/frontend. */
|
|
virtual bool should_notify_stop ()
|
|
{
|
|
return true;
|
|
}
|
|
|
|
void set_finished ()
|
|
{
|
|
finished = true;
|
|
}
|
|
|
|
bool finished_p () const
|
|
{
|
|
return finished;
|
|
}
|
|
|
|
/* The interpreter that issued the execution command that caused
|
|
this thread to resume. If the top level interpreter is MI/async,
|
|
and the execution command was a CLI command (next/step/etc.),
|
|
we'll want to print stop event output to the MI console channel
|
|
(the stepped-to line, etc.), as if the user entered the execution
|
|
command on a real GDB console. */
|
|
struct interp *command_interp = nullptr;
|
|
|
|
protected:
|
|
|
|
/* Whether the FSM is done successfully. */
|
|
bool finished = false;
|
|
|
|
/* The async_reply_reason that is broadcast to MI clients if this
|
|
FSM finishes successfully. */
|
|
virtual enum async_reply_reason do_async_reply_reason ()
|
|
{
|
|
gdb_assert_not_reached (_("should not call async_reply_reason here"));
|
|
}
|
|
};
|
|
|
|
#endif /* THREAD_FSM_H */
|