mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-15 04:31:49 +08:00
243a925328
This adds an object oriented replacement for the "struct continuation" mechanism, and converts the stepping commands (step, next, stepi, nexti) and the "finish" commands to use it. It adds a new thread "class" (struct thread_fsm) that contains the necessary info and callbacks to manage the state machine of a thread's execution command. This allows getting rid of some hacks. E.g., in fetch_inferior_event and normal_stop we no longer need to know whether a thread is doing a multi-step (e.g., step N). This effectively makes the intermediate_continuations unused -- they'll be garbage collected in a separate patch. (They were never a proper abstraction, IMO. See how fetch_inferior_event needs to check step_multi before knowing whether to call INF_EXEC_CONTINUE or INF_EXEC_COMPLETE.) The target async vs !async uiout hacks in mi_on_normal_stop go away too. print_stop_event is no longer called from normal_stop. Instead it is now called from within each interpreter's normal_stop observer. This clears the path to make each interpreter print a stop event the way it sees fit. Currently we have some hacks in common code to differenciate CLI vs TUI vs MI around this area. The "finish" command's FSM class stores the return value plus that value's position in the value history, so that those can be printed to both MI and CLI's streams. This fixes the CLI "finish" command when run from MI -- it now also includes the function's return value in the CLI stream: (gdb) ~"callee3 (strarg=0x400730 \"A string argument.\") at src/gdb/testsuite/gdb.mi/basics.c:35\n" ~"35\t}\n" +~"Value returned is $1 = 0\n" *stopped,reason="function-finished",frame=...,gdb-result-var="$1",return-value="0",thread-id="1",stopped-threads="all",core="0" -FAIL: gdb.mi/mi-cli.exp: CLI finish: check CLI output +PASS: gdb.mi/mi-cli.exp: CLI finish: check CLI output gdb/ChangeLog: 2015-09-09 Pedro Alves <palves@redhat.com> * Makefile.in (COMMON_OBS): Add thread-fsm.o. * breakpoint.c (handle_jit_event): Print debug output. (bpstat_what): Split event callback handling to ... (bpstat_run_callbacks): ... this new function. (momentary_bkpt_print_it): No longer handle bp_finish here. * breakpoint.h (bpstat_run_callbacks): Declare. * gdbthread.h (struct thread_info) <step_multi>: Delete field. <thread_fsm>: New field. (thread_cancel_execution_command): Declare. * infcmd.c: Include thread-fsm.h. (struct step_command_fsm): New. (step_command_fsm_ops): New global. (new_step_command_fsm, step_command_fsm_prepare): New functions. (step_1): Adjust to use step_command_fsm_prepare and prepare_one_step. (struct step_1_continuation_args): Delete. (step_1_continuation): Delete. (step_command_fsm_should_stop): New function. (step_once): Delete. (step_command_fsm_clean_up, step_command_fsm_async_reply_reason) (prepare_one_step): New function, based on step_once. (until_next_command): Remove step_multi reference. (struct return_value_info): New. (print_return_value): Rename to ... (print_return_value_1): ... this. New struct return_value_info parameter. Adjust. (print_return_value): Reimplement as wrapper around print_return_value_1. (struct finish_command_fsm): New. (finish_command_continuation): Delete. (finish_command_fsm_ops): New global. (new_finish_command_fsm, finish_command_fsm_should_stop): New functions. (finish_command_fsm_clean_up, finish_command_fsm_return_value): New. (finish_command_continuation_free_arg): Delete. (finish_command_fsm_async_reply_reason): New. (finish_backward, finish_forward): Change symbol parameter to a finish_command_fsm. Adjust. (finish_command): Create a finish_command_fsm. Adjust. * infrun.c: Include "thread-fsm.h". (clear_proceed_status_thread): Delete the thread's FSM. (infrun_thread_stop_requested_callback): Cancel the thread's execution command. (clean_up_just_stopped_threads_fsms): New function. (fetch_inferior_event): Handle the event_thread's should_stop method saying the command isn't done yet. (process_event_stop_test): Run breakpoint callbacks here. (print_stop_event): Rename to ... (print_stop_location): ... this. (restore_current_uiout_cleanup): New function. (print_stop_event): Reimplement. (normal_stop): No longer notify the end_stepping_range observers here handle "step N" nor "finish" here. No longer call print_stop_event here. * infrun.h (struct return_value_info): Forward declare. (print_return_value): Declare. (print_stop_event): Change prototype. * thread-fsm.c: New file. * thread-fsm.h: New file. * thread.c: Include "thread-fsm.h". (thread_cancel_execution_command): New function. (clear_thread_inferior_resources): Call it. * cli/cli-interp.c (cli_on_normal_stop): New function. (cli_interpreter_init): Install cli_on_normal_stop as normal_stop observer. * mi/mi-interp.c: Include "thread-fsm.h". (restore_current_uiout_cleanup): Delete. (mi_on_normal_stop): If the thread has an FSM associated, and it finished, ask it for the async-reply-reason to print. Always call print_stop_event here, regardless of the top-level interpreter. Check bpstat_what to tell whether an asynchronous breakpoint hit triggered. * tui/tui-interp.c (tui_on_normal_stop): New function. (tui_init): Install tui_on_normal_stop as normal_stop observer. gdb/testsuite/ChangeLog: 2015-09-09 Pedro Alves <palves@redhat.com> * gdb.mi/mi-cli.exp: Add CLI finish tests. |
||
|---|---|---|
| .. | ||
| array.f | ||
| basics.c | ||
| ChangeLog-1999-2003 | ||
| dw2-ref-missing-frame-func.c | ||
| dw2-ref-missing-frame-main.c | ||
| dw2-ref-missing-frame.exp | ||
| dw2-ref-missing-frame.S | ||
| gdb669.exp | ||
| gdb680.exp | ||
| gdb701.c | ||
| gdb701.exp | ||
| gdb792.cc | ||
| gdb792.exp | ||
| gdb2549.exp | ||
| Makefile.in | ||
| mi2-amd64-entry-value.c | ||
| mi2-amd64-entry-value.exp | ||
| mi2-amd64-entry-value.s | ||
| mi2-prompt.exp | ||
| mi2-var-child.exp | ||
| mi-async.exp | ||
| mi-basics.exp | ||
| mi-break.exp | ||
| mi-breakpoint-changed.exp | ||
| mi-catch-load-so.c | ||
| mi-catch-load.c | ||
| mi-catch-load.exp | ||
| mi-cli.exp | ||
| mi-cmd-param-changed.exp | ||
| mi-condbreak-call-thr-state-mt.c | ||
| mi-condbreak-call-thr-state-st.c | ||
| mi-condbreak-call-thr-state.c | ||
| mi-condbreak-call-thr-state.exp | ||
| mi-console.c | ||
| mi-console.exp | ||
| mi-detach.exp | ||
| mi-disassemble.exp | ||
| mi-dprintf-pending.c | ||
| mi-dprintf-pending.exp | ||
| mi-dprintf-pendshr.c | ||
| mi-dprintf.c | ||
| mi-dprintf.exp | ||
| mi-eval.exp | ||
| mi-exit-code.c | ||
| mi-exit-code.exp | ||
| mi-file-transfer.exp | ||
| mi-file.exp | ||
| mi-fill-memory.exp | ||
| mi-fullname-deleted.exp | ||
| mi-hack-cli.exp | ||
| mi-i-cmd.exp | ||
| mi-info-os.exp | ||
| mi-inheritance-syntax-error.cc | ||
| mi-inheritance-syntax-error.exp | ||
| mi-language.exp | ||
| mi-logging.exp | ||
| mi-memory-changed.exp | ||
| mi-nonstop-exit.exp | ||
| mi-nonstop.exp | ||
| mi-ns-stale-regcache.exp | ||
| mi-nsintrall.exp | ||
| mi-nsmoribund.exp | ||
| mi-nsthrexec.exp | ||
| mi-pending.c | ||
| mi-pending.exp | ||
| mi-pendshr2.c | ||
| mi-pendshr.c | ||
| mi-pthreads.exp | ||
| mi-read-memory.c | ||
| mi-read-memory.exp | ||
| mi-record-changed.exp | ||
| mi-reg-undefined.c | ||
| mi-reg-undefined.exp | ||
| mi-reg-undefined.S | ||
| mi-regs.exp | ||
| mi-return.exp | ||
| mi-reverse.exp | ||
| mi-simplerun.exp | ||
| mi-solib.exp | ||
| mi-stack.c | ||
| mi-stack.exp | ||
| mi-start.c | ||
| mi-start.exp | ||
| mi-stepi.exp | ||
| mi-stepn.c | ||
| mi-stepn.exp | ||
| mi-syn-frame.c | ||
| mi-syn-frame.exp | ||
| mi-undefined-cmd.exp | ||
| mi-until.exp | ||
| mi-var-block.exp | ||
| mi-var-child-f.exp | ||
| mi-var-child.c | ||
| mi-var-child.exp | ||
| mi-var-cmd.exp | ||
| mi-var-cp.cc | ||
| mi-var-cp.exp | ||
| mi-var-create-rtti.c | ||
| mi-var-create-rtti.exp | ||
| mi-var-display.exp | ||
| mi-var-invalidate.exp | ||
| mi-var-list-children-invalid-grandchild.c | ||
| mi-var-list-children-invalid-grandchild.exp | ||
| mi-var-rtti.cc | ||
| mi-var-rtti.exp | ||
| mi-vla-c99.exp | ||
| mi-watch-nonstop.exp | ||
| mi-watch.exp | ||
| non-stop-exit.c | ||
| non-stop.c | ||
| ns-stale-regcache.c | ||
| nsintrall.c | ||
| nsmoribund.c | ||
| nsthrexec.c | ||
| pending.c | ||
| pendshr1.c | ||
| pendshr2.c | ||
| pr11022.c | ||
| pr11022.exp | ||
| pthreads.c | ||
| solib-lib.c | ||
| solib-main.c | ||
| testcmds | ||
| until.c | ||
| var-cmd.c | ||
| vla.c | ||
| watch-nonstop.c | ||