From: Simon Marchi Date: Thu, 20 Apr 2023 18:46:58 +0000 (-0400) Subject: gdb: add interp::on_exited method X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bf64d1d5bf718859b2687a0a011246b9cbbca9e1;p=binutils-gdb.git gdb: add interp::on_exited method Same as previous patch, but for exited. Remove the exited observable, since nothing uses it anymore, and we don't have anything coming that will use it. Change-Id: I358cbea0159af56752dfee7510d6a86191e722bb --- diff --git a/gdb/cli/cli-interp.c b/gdb/cli/cli-interp.c index aba73f142af..6cb315cb57d 100644 --- a/gdb/cli/cli-interp.c +++ b/gdb/cli/cli-interp.c @@ -140,19 +140,10 @@ cli_interp_base::on_signal_exited (gdb_signal sig) print_signal_exited_reason (this->interp_ui_out (), sig); } -/* Observer for the exited notification. */ - -static void -cli_base_on_exited (int exitstatus) +void +cli_interp_base::on_exited (int status) { - SWITCH_THRU_ALL_UIS () - { - cli_interp_base *cli = as_cli_interp_base (top_level_interpreter ()); - if (cli == nullptr) - continue; - - print_exited_reason (cli->interp_ui_out (), exitstatus); - } + print_exited_reason (this->interp_ui_out (), status); } /* Observer for the no_history notification. */ @@ -379,7 +370,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::exited.attach (cli_base_on_exited, "cli-interp-base"); gdb::observers::no_history.attach (cli_base_on_no_history, "cli-interp-base"); gdb::observers::sync_execution_done.attach (cli_base_on_sync_execution_done, "cli-interp-base"); diff --git a/gdb/cli/cli-interp.h b/gdb/cli/cli-interp.h index 6342efa2dd5..2e50860efa9 100644 --- a/gdb/cli/cli-interp.h +++ b/gdb/cli/cli-interp.h @@ -36,6 +36,7 @@ public: void on_signal_received (gdb_signal sig) override; void on_signal_exited (gdb_signal sig) override; void on_normal_stop (bpstat *bs, int print_frame) override; + void on_exited (int status) override; private: struct saved_output_files diff --git a/gdb/infrun.c b/gdb/infrun.c index 295f399791d..43a7ff28fe1 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -5728,7 +5728,7 @@ handle_inferior_event (struct execution_control_state *ecs) /* Support the --return-child-result option. */ return_child_result_value = ecs->ws.exit_status (); - gdb::observers::exited.notify (ecs->ws.exit_status ()); + interps_notify_exited (ecs->ws.exit_status ()); } else { diff --git a/gdb/interps.c b/gdb/interps.c index 566b5e1195a..a7fede1d331 100644 --- a/gdb/interps.c +++ b/gdb/interps.c @@ -422,6 +422,14 @@ interps_notify_normal_stop (bpstat *bs, int print_frame) interps_notify (&interp::on_normal_stop, bs, print_frame); } +/* See interps.h. */ + +void +interps_notify_exited (int status) +{ + interps_notify (&interp::on_exited, status); +} + /* This just adds the "interpreter-exec" command. */ void _initialize_interpreter (); void diff --git a/gdb/interps.h b/gdb/interps.h index 752f2e8ea61..6c2656dd1b0 100644 --- a/gdb/interps.h +++ b/gdb/interps.h @@ -94,6 +94,10 @@ public: /* Notify the interpreter that the current inferior has stopped normally. */ virtual void on_normal_stop (bpstat *bs, int print_frame) {} + /* Notify the intepreter that the current inferior has exited normally with + status STATUS. */ + virtual void on_exited (int status) {} + private: /* The memory for this is static, it comes from literal strings (e.g. "cli"). */ const char *m_name; @@ -193,6 +197,10 @@ extern void interps_notify_signal_exited (gdb_signal sig); /* Notify all interpreters that the current inferior has stopped normally. */ extern void interps_notify_normal_stop (bpstat *bs, int print_frame); +/* Notify all interpreters that the current inferior has exited normally with + status STATUS. */ +extern void interps_notify_exited (int status); + /* well-known interpreters */ #define INTERP_CONSOLE "console" #define INTERP_MI2 "mi2" diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c index ba9297e54c5..cfe15161494 100644 --- a/gdb/mi/mi-interp.c +++ b/gdb/mi/mi-interp.c @@ -60,7 +60,6 @@ static int mi_interp_query_hook (const char *ctlstr, va_list ap) static void mi_insert_notify_hooks (void); static void mi_remove_notify_hooks (void); -static void mi_on_exited (int exitstatus); static void mi_on_no_history (void); static void mi_new_thread (struct thread_info *t); @@ -536,21 +535,11 @@ mi_interp::on_signal_exited (gdb_signal sig) print_signal_exited_reason (this->cli_uiout, sig); } -/* Observer for the exited notification. */ - -static void -mi_on_exited (int exitstatus) +void +mi_interp::on_exited (int status) { - SWITCH_THRU_ALL_UIS () - { - struct mi_interp *mi = find_mi_interp (); - - if (mi == NULL) - continue; - - print_exited_reason (mi->mi_uiout, exitstatus); - print_exited_reason (mi->cli_uiout, exitstatus); - } + print_exited_reason (this->mi_uiout, status); + print_exited_reason (this->cli_uiout, status); } /* Observer for the no_history notification. */ @@ -1264,7 +1253,6 @@ _initialize_mi_interp () interp_factory_register (INTERP_MI4, mi_interp_factory); interp_factory_register (INTERP_MI, mi_interp_factory); - gdb::observers::exited.attach (mi_on_exited, "mi-interp"); gdb::observers::no_history.attach (mi_on_no_history, "mi-interp"); gdb::observers::new_thread.attach (mi_new_thread, "mi-interp"); gdb::observers::thread_exit.attach (mi_thread_exit, "mi-interp"); diff --git a/gdb/mi/mi-interp.h b/gdb/mi/mi-interp.h index 2b825e7d9d8..9b29bb5547f 100644 --- a/gdb/mi/mi-interp.h +++ b/gdb/mi/mi-interp.h @@ -45,6 +45,7 @@ public: void on_signal_received (gdb_signal sig) override; void on_signal_exited (gdb_signal sig) override; void on_normal_stop (struct bpstat *bs, int print_frame) override; + void on_exited (int status) override; /* MI's output channels */ mi_console_file *out; diff --git a/gdb/observable.c b/gdb/observable.c index 8cbf0377b0b..84389002383 100644 --- a/gdb/observable.c +++ b/gdb/observable.c @@ -34,7 +34,6 @@ bool observer_debug = false; DEFINE_OBSERVABLE (normal_stop); DEFINE_OBSERVABLE (signal_received); -DEFINE_OBSERVABLE (exited); DEFINE_OBSERVABLE (no_history); DEFINE_OBSERVABLE (sync_execution_done); DEFINE_OBSERVABLE (command_error); diff --git a/gdb/observable.h b/gdb/observable.h index aaf1ddda4d4..25af2da6e93 100644 --- a/gdb/observable.h +++ b/gdb/observable.h @@ -57,9 +57,6 @@ extern observable normal_stop; /* The inferior was stopped by a signal. */ extern observable signal_received; -/* The inferior program is finished. */ -extern observable exited; - /* Reverse execution: target ran out of history info. */ extern observable<> no_history;