388a708404
This removes infcall-specific special casing from normal_stop, simplifying it. Like the "finish" command's, the FSM is responsible for storing the function's return value. gdb/ChangeLog: 2015-09-09 Pedro Alves <palves@redhat.com> * infcall.c: Include thread_fsm.h. (struct call_return_meta_info): New. (get_call_return_value): New function, factored out from call_function_by_hand_dummy. (struct call_thread_fsm): New. (call_thread_fsm_ops): New global. (new_call_thread_fsm, call_thread_fsm_should_stop) (call_thread_fsm_should_notify_stop): New functions. (run_inferior_call): Add 'sm' parameter. Associate the FSM with the thread. (call_function_by_hand_dummy): Create a new call_thread_fsm instance, associate it with the thread, and wait for the FSM to finish. If finished successfully, fetch the function's result value out of the FSM. * infrun.c (fetch_inferior_event): If the FSM says the stop shouldn't be notified, don't call normal_stop. (maybe_remove_breakpoints): New function, factored out from ... (normal_stop): ... here. Simplify. * infrun.h (maybe_remove_breakpoints): Declare. * thread-fsm.c (thread_fsm_should_notify_stop): New function. (thread-fsm.h) <struct thread_fsm_ops>: New field. (thread_fsm_should_notify_stop): Declare.
108 lines
2.4 KiB
C
108 lines
2.4 KiB
C
/* Thread command's finish-state machine, for GDB, the GNU debugger.
|
|
Copyright (C) 2015 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/>. */
|
|
|
|
#include "defs.h"
|
|
#include "thread-fsm.h"
|
|
|
|
/* See thread-fsm.h. */
|
|
|
|
void
|
|
thread_fsm_ctor (struct thread_fsm *self, struct thread_fsm_ops *ops)
|
|
{
|
|
self->finished = 0;
|
|
self->ops = ops;
|
|
}
|
|
|
|
/* See thread-fsm.h. */
|
|
|
|
void
|
|
thread_fsm_delete (struct thread_fsm *self)
|
|
{
|
|
if (self != NULL)
|
|
{
|
|
if (self->ops->dtor != NULL)
|
|
self->ops->dtor (self);
|
|
xfree (self);
|
|
}
|
|
}
|
|
|
|
/* See thread-fsm.h. */
|
|
|
|
void
|
|
thread_fsm_clean_up (struct thread_fsm *self)
|
|
{
|
|
if (self->ops->clean_up != NULL)
|
|
self->ops->clean_up (self);
|
|
}
|
|
|
|
/* See thread-fsm.h. */
|
|
|
|
int
|
|
thread_fsm_should_stop (struct thread_fsm *self)
|
|
{
|
|
return self->ops->should_stop (self);
|
|
}
|
|
|
|
/* See thread-fsm.h. */
|
|
|
|
struct return_value_info *
|
|
thread_fsm_return_value (struct thread_fsm *self)
|
|
{
|
|
if (self->ops->return_value != NULL)
|
|
return self->ops->return_value (self);
|
|
return NULL;
|
|
}
|
|
|
|
/* See thread-fsm.h. */
|
|
|
|
void
|
|
thread_fsm_set_finished (struct thread_fsm *self)
|
|
{
|
|
self->finished = 1;
|
|
}
|
|
|
|
/* See thread-fsm.h. */
|
|
|
|
int
|
|
thread_fsm_finished_p (struct thread_fsm *self)
|
|
{
|
|
return self->finished;
|
|
}
|
|
|
|
/* See thread-fsm.h. */
|
|
|
|
enum async_reply_reason
|
|
thread_fsm_async_reply_reason (struct thread_fsm *self)
|
|
{
|
|
/* If we didn't finish, then the stop reason must come from
|
|
elsewhere. E.g., a breakpoint hit or a signal intercepted. */
|
|
gdb_assert (thread_fsm_finished_p (self));
|
|
|
|
return self->ops->async_reply_reason (self);
|
|
}
|
|
|
|
/* See thread-fsm.h. */
|
|
|
|
int
|
|
thread_fsm_should_notify_stop (struct thread_fsm *self)
|
|
{
|
|
if (self->ops->should_notify_stop != NULL)
|
|
return self->ops->should_notify_stop (self);
|
|
return 1;
|
|
}
|