diff options
| author | Simon Marchi <simon.marchi@efficios.com> | 2023-04-20 16:07:12 -0400 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@efficios.com> | 2023-05-30 15:07:26 -0400 |
| commit | 77cd03e27c547a5b5b7f086a0b537084eb399258 (patch) | |
| tree | f38ecc8550cbfd0c4fd13d14de985daf83b764a0 /gdb/cli | |
| parent | 2736b77153629619fe75071356e16d9db51606ff (diff) | |
| download | gdb-77cd03e27c547a5b5b7f086a0b537084eb399258.zip gdb-77cd03e27c547a5b5b7f086a0b537084eb399258.tar.gz gdb-77cd03e27c547a5b5b7f086a0b537084eb399258.tar.bz2 | |
gdb: add interp::on_user_selected_context_changed method
Same as previous patches, but for user_selected_context_changed.
Change-Id: I40de15be897671227d4bcf3e747f0fd595f0d5be
Diffstat (limited to 'gdb/cli')
| -rw-r--r-- | gdb/cli/cli-interp.c | 36 | ||||
| -rw-r--r-- | gdb/cli/cli-interp.h | 1 |
2 files changed, 8 insertions, 29 deletions
diff --git a/gdb/cli/cli-interp.c b/gdb/cli/cli-interp.c index ffb4072..6a175f7 100644 --- a/gdb/cli/cli-interp.c +++ b/gdb/cli/cli-interp.c @@ -67,15 +67,6 @@ cli_interp::cli_interp (const char *name) /* Suppress notification struct. */ struct cli_suppress_notification cli_suppress_notification; -/* Returns the INTERP's data cast as cli_interp_base if INTERP is a - console-like interpreter, and returns NULL otherwise. */ - -static cli_interp_base * -as_cli_interp_base (interp *interp) -{ - return dynamic_cast<cli_interp_base *> (interp); -} - /* See cli-interp.h. Breakpoint hits should always be mirrored to a console. Deciding @@ -164,10 +155,8 @@ cli_interp_base::on_command_error () display_gdb_prompt (NULL); } -/* Observer for the user_selected_context_changed notification. */ - -static void -cli_base_on_user_selected_context_changed (user_selected_what selection) +void +cli_interp_base::on_user_selected_context_changed (user_selected_what selection) { /* This event is suppressed. */ if (cli_suppress_notification.user_selected_context) @@ -175,19 +164,12 @@ cli_base_on_user_selected_context_changed (user_selected_what selection) thread_info *tp = inferior_ptid != null_ptid ? inferior_thread () : nullptr; - SWITCH_THRU_ALL_UIS () - { - cli_interp_base *cli = as_cli_interp_base (top_level_interpreter ()); - if (cli == nullptr) - continue; - - if (selection & USER_SELECTED_INFERIOR) - print_selected_inferior (cli->interp_ui_out ()); + if (selection & USER_SELECTED_INFERIOR) + print_selected_inferior (this->interp_ui_out ()); - if (tp != nullptr - && ((selection & (USER_SELECTED_THREAD | USER_SELECTED_FRAME)))) - print_selected_thread_frame (cli->interp_ui_out (), selection); - } + if (tp != nullptr + && ((selection & (USER_SELECTED_THREAD | USER_SELECTED_FRAME)))) + print_selected_thread_frame (this->interp_ui_out (), selection); } /* pre_command_loop implementation. */ @@ -347,8 +329,4 @@ void _initialize_cli_interp () { interp_factory_register (INTERP_CONSOLE, cli_interp_factory); - - /* Note these all work for both the CLI and TUI interpreters. */ - gdb::observers::user_selected_context_changed.attach - (cli_base_on_user_selected_context_changed, "cli-interp-base"); } diff --git a/gdb/cli/cli-interp.h b/gdb/cli/cli-interp.h index 5020b2b..a1a20b6 100644 --- a/gdb/cli/cli-interp.h +++ b/gdb/cli/cli-interp.h @@ -40,6 +40,7 @@ public: void on_no_history () override; void on_sync_execution_done () override; void on_command_error () override; + void on_user_selected_context_changed (user_selected_what selection) override; private: struct saved_output_files |