diff options
| author | Simon Marchi <simon.marchi@efficios.com> | 2023-03-01 20:38:35 -0500 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@efficios.com> | 2023-05-30 15:07:26 -0400 |
| commit | 8782926771b1212acb90b944f7402466c998d592 (patch) | |
| tree | f46baf46bc4895ecbd7fbcec6b5243f1a0bcc1ab /gdb/cli | |
| parent | 3f75a984d27da2801a9c4237b2b40917c68d6f19 (diff) | |
| download | gdb-8782926771b1212acb90b944f7402466c998d592.zip gdb-8782926771b1212acb90b944f7402466c998d592.tar.gz gdb-8782926771b1212acb90b944f7402466c998d592.tar.bz2 | |
gdb: add interp::on_normal_stop method
Same idea as the previous patch, but for the normal_stop event.
Change-Id: I4fc8ca8a51c63829dea390a2b6ce30b77f9fb863
Diffstat (limited to 'gdb/cli')
| -rw-r--r-- | gdb/cli/cli-interp.c | 21 | ||||
| -rw-r--r-- | gdb/cli/cli-interp.h | 1 |
2 files changed, 6 insertions, 16 deletions
diff --git a/gdb/cli/cli-interp.c b/gdb/cli/cli-interp.c index 51c78d9..9508171 100644 --- a/gdb/cli/cli-interp.c +++ b/gdb/cli/cli-interp.c @@ -112,10 +112,8 @@ should_print_stop_to_console (struct interp *console_interp, interpreter-exec), print nothing. These are named "cli_base" as they print to both CLI interpreters and TUI interpreters. */ -/* Observer for the normal_stop notification. */ - -static void -cli_base_on_normal_stop (struct bpstat *bs, int print_frame) +void +cli_interp_base::on_normal_stop (struct bpstat *bs, int print_frame) { if (!print_frame) return; @@ -124,17 +122,10 @@ cli_base_on_normal_stop (struct bpstat *bs, int print_frame) if (cli_suppress_notification.normal_stop) return; - SWITCH_THRU_ALL_UIS () - { - struct interp *interp = top_level_interpreter (); - cli_interp_base *cli = as_cli_interp_base (interp); - if (cli == nullptr) - continue; + thread_info *thread = inferior_thread (); + if (should_print_stop_to_console (this, thread)) + print_stop_event (this->interp_ui_out ()); - thread_info *thread = inferior_thread (); - if (should_print_stop_to_console (interp, thread)) - print_stop_event (cli->interp_ui_out ()); - } } void @@ -397,8 +388,6 @@ _initialize_cli_interp () interp_factory_register (INTERP_CONSOLE, cli_interp_factory); /* Note these all work for both the CLI and TUI interpreters. */ - gdb::observers::normal_stop.attach (cli_base_on_normal_stop, - "cli-interp-base"); gdb::observers::signal_exited.attach (cli_base_on_signal_exited, "cli-interp-base"); gdb::observers::exited.attach (cli_base_on_exited, "cli-interp-base"); diff --git a/gdb/cli/cli-interp.h b/gdb/cli/cli-interp.h index f7bee45..4fca801 100644 --- a/gdb/cli/cli-interp.h +++ b/gdb/cli/cli-interp.h @@ -34,6 +34,7 @@ public: bool supports_command_editing () override; void on_signal_received (gdb_signal sig) override; + void on_normal_stop(bpstat *bs, int print_frame) override; private: struct saved_output_files |